Merge pull request #30 from VanDerSam/master

Improvements for program

aboutDialog.ui

@@ -174,8 +174,8 @@ The text of the license can can be found in the file LICENSE.</string>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>168</x>
-     <y>286</y>
+     <x>252</x>
+     <y>309</y>
     </hint>
     <hint type="destinationlabel">
      <x>289</x>

application.cpp

@@ -17,7 +17,7 @@ zApplication::zApplication(Display* dpy, const QString& appId, int argc, char**
 	: QtSingleApplication(dpy, appId, argc, argv, visual, colormap) {}
 #endif
 
-void zApplication::commitData(QSessionManager &) //fixing "KDE kogout was cancelled by zNotes" bug
+void zApplication::commitData(QSessionManager &) //fixing "KDE logout was cancelled by zNotes" bug
 {
 	settings.save();
 }

application.h

@@ -16,7 +16,7 @@ class zApplication: public QtSingleApplication
 	zApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
 #endif
 	~zApplication() {}
-	void commitData(QSessionManager &); //fixing "KDE kogout was cancelled by zNotes" bug
+    void commitData(QSessionManager &); //fixing "KDE logout was cancelled by zNotes" bug
 };
 
 #endif // APPLICATION_H

configdialog.cpp

@@ -9,6 +9,8 @@
 #include <QFontDialog>
 #include <QColorDialog>
 
+#define SINGLE_INSTANCE
+
 configDialog::configDialog(QWidget *parent) :
 	QDialog(parent), m_ui(new Ui::configDialog)
 {

dist/README.txt

@@ -0,0 +1,10 @@
+This directory contents script files for building installers (installation programs) for zNotes.
+The directory "is" contents scripts for building an installer with "Inno Setup Compiler".
+The directory "qtifw" contents scripts for building an installer with "Qt Installer Framework".
+To build an installer with "Inno Setup Compiler" it needs to run command:
+  "<path to Inno Setup directory>\iscc.exe" script.iss 
+in "is" directory.
+
+To build an installer with "Qt Installer Framework" it needs to run command:
+  <path to Qt Installer Framework bin directory>\binarycreator.exe --offline-only -p packages -c config\config.xml zNotesInstaller.exe
+in "qtifw" directory.

dist/is/script.iss

@@ -0,0 +1,65 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "zNotes"
+#define MyAppVersion "0.4.5"
+#define MyAppPublisher "Muratov Sergey"
+#define MyAppURL "http://sourceforge.net/projects/znotes"
+#define MyAppExeName "znotes.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{E5F2F832-E3D5-4C00-AC23-89574C15E236}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+LicenseFile=data\LICENSE.GPL
+OutputBaseFilename=zNotesInstaller
+Compression=lzma
+SolidCompression=yes
+;-----------------------------------------------------
+;Next entries customize user interface of an installer
+;-----------------------------------------------------
+SetupIconFile=data\znotes.ico
+WizardSmallImageFile=data\logo.bmp
+WizardImageFile=data\watermark.bmp
+UninstallDisplayIcon=data\znotes.ico
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Dirs]
+Name: "{app}\bin"
+Name: "{app}\bin\translations"
+
+[Files]
+Source: "data\bin\znotes.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\mingwm10.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\QtXml4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "data\bin\translations\*"; DestDir: "{app}\bin\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\bin\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

dist/qtifw/README

@@ -0,0 +1 @@
+Contains the configuration for the installer of the zNotes.

dist/qtifw/config/config.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+    <Installer>
+    <Name>zNotes</Name>
+    <Title>Simple application to control your notes</Title>
+    <Version>0.4.5</Version>
+    <Publisher>Muratov Sergey</Publisher>
+    <ProductUrl>http://sourceforge.net/projects/znotes/</ProductUrl>
+    <Logo>logo.png</Logo>
+    <Watermark>watermark.jpg</Watermark>
+    <UninstallerName>Uninstaller</UninstallerName>
+
+    <!-- Tweaked for windows in installscript.qs -->
+    <TargetDir>@homeDir@/znotes</TargetDir>
+</Installer>

dist/qtifw/packages/org.znotes.ifw.binaries/meta/package.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<Package>
+    <DisplayName>zNotes Binaries</DisplayName>
+    <Description>Installs the binaries, translations.</Description>
+    <Version>0.4.5</Version>
+    <ReleaseDate>2014-06-18</ReleaseDate>
+    <Default>True</Default>
+</Package>