Skip to content

Commit fc8e5d2

Browse files
protonproton
committed
0.3.5!!!
1 parent 75769ee commit fc8e5d2

11 files changed

+375
-20
lines changed

‎CHANGELOG

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
zNotes 0.3.5
2+
* Fixed bug with compilation on not "unix" operation systems
3+
* Added icon to application (for OS/2)
4+
* Updated about dialog
5+
* Some fixes
6+
* Updated russian translate
7+
18
zNotes 0.3.4
29
* Added ability to hide some parts of toolbar's elements
310
* Updated russian translate

‎THANKS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Elbert Pol <[email protected]> for testing on OS/2

‎aboutDialog.cpp

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#include "aboutDialog.h"
2+
#include "ui_aboutDialog.h"
3+
4+
#ifndef VERSION
5+
#define VERSION "unknown"
6+
#endif
7+
8+
aboutDialog::aboutDialog(QWidget *parent) :
9+
QDialog(parent), ui(new Ui::aboutDialog)
10+
{
11+
ui->setupUi(this);
12+
ui->lbAbout->setText(QString("zNotes\n%1\n%2 %3\n%4\n%5\n\n%6")
13+
.arg(tr("Simple Qt-based notes aplication"))
14+
.arg(tr("version")).arg(VERSION)
15+
.arg(tr("Copyright (c) 2009"))
16+
.arg(tr("by Peter Savichev (proton)"))
17+
.arg(tr("Distributed under the GPL license version 3 or later")));
18+
//
19+
QString strAuthors;
20+
strAuthors.append(QString("<p><b>%1</b> - <a href='mailto:%2'>%2</a><br/>%3<p>")
21+
.arg("Peter Savichev (proton)").arg("[email protected]")
22+
.arg(tr("Application concept and main development")));
23+
strAuthors.append(QString("<p><b>%1</b></p>").arg(tr("Translations:")));
24+
strAuthors.append(QString("<p><b>%1</b> - <a href='mailto:%2'>%2</a><br/>%3</p>")
25+
.arg("Peter Savichev (proton)").arg("[email protected]")
26+
.arg(tr("Russian translation")));
27+
strAuthors.append(QString("<p><b>%1</b></p>").arg(tr("Icons:")));
28+
strAuthors.append(QString("%1\n<a hreh='%2'>%2</a>")
29+
.arg(tr("All icons from Oxygen project")).arg("http://www.oxygen-icons.org"));
30+
ui->lbAuthors->setHtml(strAuthors);
31+
//
32+
QString strCredits;
33+
strCredits.append(QString("<p><b>%1</b><p>").arg(tr("Testing:")));
34+
strCredits.append(QString("<b>%1</b> - <a href='mailto:%2'>%2</a><br/>").arg("Nikolay Edigaryev").arg("[email protected]"));
35+
strCredits.append(QString("<b>%1</b> - <a href='mailto:%2'>%2</a><br/>").arg("Nikita Lyalin (tinman321)").arg("[email protected]"));
36+
strCredits.append(QString("<b>%1</b> -<a href='mailto:%2'>%2</a><br/>").arg("Elbert Pol").arg("[email protected]"));
37+
strCredits.append(QString("<p><b>%1</b></p>").arg(tr("Releasing:")));
38+
strCredits.append(QString("<p><b>%1</b> - <a href='mailto:%2'>%2</a><br/>%3</p>")
39+
.arg("Peter Savichev (proton)").arg("[email protected]")
40+
.arg("Gentoo"));
41+
strCredits.append(QString("<p><b>%1</b> - <a href='mailto:%2'>%2></a><br/>%3</p>")
42+
.arg("Nikita Lyalin (tinman321)").arg("[email protected]")
43+
.arg("ArchLinux"));
44+
ui->lbCredits->setHtml(strCredits);
45+
}
46+
47+
aboutDialog::~aboutDialog()
48+
{
49+
delete ui;
50+
}

‎aboutDialog.h

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#ifndef ABOUTDIALOG_H
2+
#define ABOUTDIALOG_H
3+
4+
#include <QDialog>
5+
6+
namespace Ui {
7+
class aboutDialog;
8+
}
9+
10+
class aboutDialog : public QDialog {
11+
Q_OBJECT
12+
public:
13+
aboutDialog(QWidget *parent = 0);
14+
~aboutDialog();
15+
16+
private:
17+
Ui::aboutDialog *ui;
18+
};
19+
20+
#endif // ABOUTDIALOG_H

‎aboutDialog.ui

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>aboutDialog</class>
4+
<widget class="QDialog" name="aboutDialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>349</width>
10+
<height>298</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>about zNotes</string>
15+
</property>
16+
<property name="windowIcon">
17+
<iconset resource="znotes.qrc">
18+
<normaloff>:/res/znotes.png</normaloff>:/res/znotes.png</iconset>
19+
</property>
20+
<layout class="QVBoxLayout" name="verticalLayout">
21+
<item>
22+
<widget class="QLabel" name="icon">
23+
<property name="text">
24+
<string/>
25+
</property>
26+
<property name="pixmap">
27+
<pixmap resource="znotes.qrc">:/res/znotes32.png</pixmap>
28+
</property>
29+
<property name="alignment">
30+
<set>Qt::AlignCenter</set>
31+
</property>
32+
</widget>
33+
</item>
34+
<item>
35+
<widget class="QTabWidget" name="tabWidget">
36+
<property name="currentIndex">
37+
<number>0</number>
38+
</property>
39+
<widget class="QWidget" name="widget">
40+
<attribute name="title">
41+
<string>About</string>
42+
</attribute>
43+
<layout class="QVBoxLayout" name="verticalLayout_2">
44+
<item>
45+
<widget class="QLabel" name="lbAbout">
46+
<property name="text">
47+
<string>zNotes</string>
48+
</property>
49+
<property name="alignment">
50+
<set>Qt::AlignHCenter|Qt::AlignTop</set>
51+
</property>
52+
<property name="wordWrap">
53+
<bool>true</bool>
54+
</property>
55+
</widget>
56+
</item>
57+
</layout>
58+
</widget>
59+
<widget class="QWidget" name="widget">
60+
<attribute name="title">
61+
<string>Authors</string>
62+
</attribute>
63+
<layout class="QVBoxLayout" name="verticalLayout_4">
64+
<item>
65+
<widget class="QTextBrowser" name="lbAuthors"/>
66+
</item>
67+
</layout>
68+
</widget>
69+
<widget class="QWidget" name="widget">
70+
<attribute name="title">
71+
<string>Credits</string>
72+
</attribute>
73+
<layout class="QVBoxLayout" name="verticalLayout_5">
74+
<item>
75+
<widget class="QTextBrowser" name="lbCredits"/>
76+
</item>
77+
</layout>
78+
</widget>
79+
<widget class="QWidget" name="widget">
80+
<attribute name="title">
81+
<string>License</string>
82+
</attribute>
83+
<layout class="QVBoxLayout" name="verticalLayout_3">
84+
<item>
85+
<widget class="QPlainTextEdit" name="textLicense">
86+
<property name="readOnly">
87+
<bool>true</bool>
88+
</property>
89+
<property name="plainText">
90+
<string>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
91+
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
92+
See the GNU General Public License for more details.
93+
94+
The text of the license can can be found in the file LICENSE.</string>
95+
</property>
96+
</widget>
97+
</item>
98+
</layout>
99+
</widget>
100+
</widget>
101+
</item>
102+
<item>
103+
<layout class="QHBoxLayout" name="horizontalLayout">
104+
<item>
105+
<spacer name="horizontalSpacer">
106+
<property name="orientation">
107+
<enum>Qt::Horizontal</enum>
108+
</property>
109+
<property name="sizeHint" stdset="0">
110+
<size>
111+
<width>40</width>
112+
<height>20</height>
113+
</size>
114+
</property>
115+
</spacer>
116+
</item>
117+
<item>
118+
<widget class="QPushButton" name="butClose">
119+
<property name="text">
120+
<string>Close</string>
121+
</property>
122+
</widget>
123+
</item>
124+
<item>
125+
<spacer name="horizontalSpacer_2">
126+
<property name="orientation">
127+
<enum>Qt::Horizontal</enum>
128+
</property>
129+
<property name="sizeHint" stdset="0">
130+
<size>
131+
<width>40</width>
132+
<height>20</height>
133+
</size>
134+
</property>
135+
</spacer>
136+
</item>
137+
</layout>
138+
</item>
139+
</layout>
140+
</widget>
141+
<resources>
142+
<include location="znotes.qrc"/>
143+
</resources>
144+
<connections>
145+
<connection>
146+
<sender>butClose</sender>
147+
<signal>clicked()</signal>
148+
<receiver>aboutDialog</receiver>
149+
<slot>accept()</slot>
150+
<hints>
151+
<hint type="sourcelabel">
152+
<x>168</x>
153+
<y>286</y>
154+
</hint>
155+
<hint type="destinationlabel">
156+
<x>289</x>
157+
<y>266</y>
158+
</hint>
159+
</hints>
160+
</connection>
161+
</connections>
162+
</ui>

‎mainwindow.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "mainwindow.h"
22
#include "ui_mainwindow.h"
3-
43
#include "settings.h"
54
#include "configdialog.h"
5+
#include "aboutDialog.h"
66

77
#include <QtDebug>
88
#include <QInputDialog>
@@ -187,13 +187,13 @@ void MainWindow::closeEvent(QCloseEvent *event)
187187
}
188188
}
189189

190-
void MainWindow::aboutDialog()
190+
void MainWindow::showAboutDialog()
191191
{
192-
QMessageBox::information(this, tr("zNotes - about"),
193-
tr("zNotes %1\nby Peter Savichev (proton)\n[email protected]\n2009").arg(VERSION));
192+
aboutDialog dlg;
193+
dlg.exec();
194194
}
195195

196-
void MainWindow::prefDialog()
196+
void MainWindow::showPrefDialog()
197197
{
198198
configDialog dlg;
199199
dlg.exec();
@@ -333,7 +333,7 @@ MainWindow::MainWindow(QWidget *parent)
333333
QObject::connect(actPrev, SIGNAL(triggered()), this, SLOT(PreviousNote()));
334334
QObject::connect(actNext, SIGNAL(triggered()), this, SLOT(NextNote()));
335335
QObject::connect(actCopy, SIGNAL(triggered()), this, SLOT(CopyNote()));
336-
QObject::connect(actSetup, SIGNAL(triggered()), this, SLOT(prefDialog()));
336+
QObject::connect(actSetup, SIGNAL(triggered()), this, SLOT(showPrefDialog()));
337337
QObject::connect(actRun, SIGNAL(triggered()), this, SLOT(commandMenu()));
338338
QObject::connect(actExit, SIGNAL(triggered()), qApp, SLOT(quit()));
339339
actAdd->setShortcut(QKeySequence::New);
@@ -349,8 +349,8 @@ MainWindow::MainWindow(QWidget *parent)
349349
cmenu.addAction(QIcon(":/res/remove.png"), tr("Remove this note"), this, SLOT(RemoveCurrentNote()));
350350
cmenu.addAction(QIcon(":/res/rename.png"), tr("Rename this note"), this, SLOT(RenameCurrentNote()));
351351
cmenu.addSeparator();
352-
cmenu.addAction(QIcon(":/res/settings.png"), tr("Preferences"), this, SLOT(prefDialog()));
353-
cmenu.addAction(QIcon(":/res/info.png"), tr("About"), this, SLOT(aboutDialog()));
352+
cmenu.addAction(QIcon(":/res/settings.png"), tr("Preferences"), this, SLOT(showPrefDialog()));
353+
cmenu.addAction(QIcon(":/res/info.png"), tr("About"), this, SLOT(showAboutDialog()));
354354
cmenu.addSeparator();
355355
cmenu.addAction(QIcon(":/res/exit.png"), tr("Quit"), qApp, SLOT(quit()));
356356
cmenu.actions()[10]->setShortcut(QKeySequence::Close);

‎mainwindow.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public slots:
6868
void trayActivated(QSystemTrayIcon::ActivationReason reason);
6969
//
7070
void commandMenu();
71-
void aboutDialog();
72-
void prefDialog();
71+
void showAboutDialog();
72+
void showPrefDialog();
7373
//
7474
void actions_changed();
7575
//

0 commit comments

Comments
 (0)