This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from c4e01b1 x2goclient.pro: reference files moved to src/ and src/i18n/. new a0c48e0 general: move *.ui files to src/ui/ and reference in x2goclient.pro. new ccb3859 x2goclient.pro: translate and simplify header. new 13cf05c x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. new 34bc8c0 general: move resource files to src/res/ and reference in x2goclient.pro. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++ changelog.rcc => src/res/changelog.rcc | 0 git.rcc => src/res/git.rcc | 0 resources.rcc => src/res/resources.rcc | 0 x2goclient.rc => src/res/x2goclient.rc | 0 appdialog.ui => src/ui/appdialog.ui | 0 brokerpassdialog.ui => src/ui/brokerpassdialog.ui | 0 contest.ui => src/ui/contest.ui | 0 .../ui/cupsprintsettingsdialog.ui | 0 cupsprintwidget.ui => src/ui/cupsprintwidget.ui | 0 folderexplorer.ui => src/ui/folderexplorer.ui | 0 helpdialog.ui => src/ui/helpdialog.ui | 0 printdialog.ui => src/ui/printdialog.ui | 0 printercmddialog.ui => src/ui/printercmddialog.ui | 0 printwidget.ui => src/ui/printwidget.ui | 0 xsettingsui.ui => src/ui/xsettingsui.ui | 0 x2goclient.pro | 40 ++++++++++---------- x2goclientconfig.pri | 1 + 18 files changed, 25 insertions(+), 21 deletions(-) rename changelog.rcc => src/res/changelog.rcc (100%) rename git.rcc => src/res/git.rcc (100%) rename resources.rcc => src/res/resources.rcc (100%) rename x2goclient.rc => src/res/x2goclient.rc (100%) rename appdialog.ui => src/ui/appdialog.ui (100%) rename brokerpassdialog.ui => src/ui/brokerpassdialog.ui (100%) rename contest.ui => src/ui/contest.ui (100%) rename cupsprintsettingsdialog.ui => src/ui/cupsprintsettingsdialog.ui (100%) rename cupsprintwidget.ui => src/ui/cupsprintwidget.ui (100%) rename folderexplorer.ui => src/ui/folderexplorer.ui (100%) rename helpdialog.ui => src/ui/helpdialog.ui (100%) rename printdialog.ui => src/ui/printdialog.ui (100%) rename printercmddialog.ui => src/ui/printercmddialog.ui (100%) rename printwidget.ui => src/ui/printwidget.ui (100%) rename xsettingsui.ui => src/ui/xsettingsui.ui (100%) create mode 100644 x2goclientconfig.pri -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit a0c48e03a7f33e9282b184597e8b22adf83732b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:23:55 2015 +0100 general: move *.ui files to src/ui/ and reference in x2goclient.pro. --- debian/changelog | 1 + appdialog.ui => src/ui/appdialog.ui | 0 brokerpassdialog.ui => src/ui/brokerpassdialog.ui | 0 contest.ui => src/ui/contest.ui | 0 .../ui/cupsprintsettingsdialog.ui | 0 cupsprintwidget.ui => src/ui/cupsprintwidget.ui | 0 folderexplorer.ui => src/ui/folderexplorer.ui | 0 helpdialog.ui => src/ui/helpdialog.ui | 0 printdialog.ui => src/ui/printdialog.ui | 0 printercmddialog.ui => src/ui/printercmddialog.ui | 0 printwidget.ui => src/ui/printwidget.ui | 0 xsettingsui.ui => src/ui/xsettingsui.ui | 0 x2goclient.pro | 22 ++++++++++---------- 13 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3442f0a..a73f071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Move *.cpp and *.h files to src/ and *.ts files to src/i18n/. - Reference src/ in Doxyfile. - Reference src/ and src/i18n/ in x2goclient.pro. + - Move *.ui files to src/ui/ and reference in x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/appdialog.ui b/src/ui/appdialog.ui similarity index 100% rename from appdialog.ui rename to src/ui/appdialog.ui diff --git a/brokerpassdialog.ui b/src/ui/brokerpassdialog.ui similarity index 100% rename from brokerpassdialog.ui rename to src/ui/brokerpassdialog.ui diff --git a/contest.ui b/src/ui/contest.ui similarity index 100% rename from contest.ui rename to src/ui/contest.ui diff --git a/cupsprintsettingsdialog.ui b/src/ui/cupsprintsettingsdialog.ui similarity index 100% rename from cupsprintsettingsdialog.ui rename to src/ui/cupsprintsettingsdialog.ui diff --git a/cupsprintwidget.ui b/src/ui/cupsprintwidget.ui similarity index 100% rename from cupsprintwidget.ui rename to src/ui/cupsprintwidget.ui diff --git a/folderexplorer.ui b/src/ui/folderexplorer.ui similarity index 100% rename from folderexplorer.ui rename to src/ui/folderexplorer.ui diff --git a/helpdialog.ui b/src/ui/helpdialog.ui similarity index 100% rename from helpdialog.ui rename to src/ui/helpdialog.ui diff --git a/printdialog.ui b/src/ui/printdialog.ui similarity index 100% rename from printdialog.ui rename to src/ui/printdialog.ui diff --git a/printercmddialog.ui b/src/ui/printercmddialog.ui similarity index 100% rename from printercmddialog.ui rename to src/ui/printercmddialog.ui diff --git a/printwidget.ui b/src/ui/printwidget.ui similarity index 100% rename from printwidget.ui rename to src/ui/printwidget.ui diff --git a/xsettingsui.ui b/src/ui/xsettingsui.ui similarity index 100% rename from xsettingsui.ui rename to src/ui/xsettingsui.ui diff --git a/x2goclient.pro b/x2goclient.pro index 54eaf91..a696988 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -10,17 +10,17 @@ CONFIG += $$(X2GO_CLIENT_TARGET) CONFIG += $$(X2GO_LINUX_STATIC) #CONFIG += console -FORMS += cupsprintsettingsdialog.ui \ - cupsprintwidget.ui \ - printdialog.ui \ - printercmddialog.ui \ - printwidget.ui \ - xsettingsui.ui \ - brokerpassdialog.ui \ - contest.ui \ - appdialog.ui \ - helpdialog.ui \ - folderexplorer.ui +FORMS += src/ui/cupsprintsettingsdialog.ui \ + src/ui/cupsprintwidget.ui \ + src/ui/printdialog.ui \ + src/ui/printercmddialog.ui \ + src/ui/printwidget.ui \ + src/ui/xsettingsui.ui \ + src/ui/brokerpassdialog.ui \ + src/ui/contest.ui \ + src/ui/appdialog.ui \ + src/ui/helpdialog.ui \ + src/ui/folderexplorer.ui TRANSLATIONS += src/i18n/x2goclient_de.ts \ src/i18n/x2goclient_da.ts \ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit ccb3859e084275145de8491bbef776d082918f53 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:35:05 2015 +0100 x2goclient.pro: translate and simplify header. --- debian/changelog | 1 + x2goclient.pro | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a73f071..6f5ac1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Reference src/ in Doxyfile. - Reference src/ and src/i18n/ in x2goclient.pro. - Move *.ui files to src/ui/ and reference in x2goclient.pro. + - Translate and simplify header in x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index a696988..4b4f0ae 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -1,7 +1,5 @@ -# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. -# ------------------------------------------- -# Unterordner relativ zum Projektordner: . -# Das Target ist eine Anwendung: +# This file was created by KDevelop. +# ------------------------------------------- #include (x2goclientconfig.pri) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 13cf05c2b9fc125d4895fddc22938d28644d8ce0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:40:49 2015 +0100 x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. --- debian/changelog | 2 ++ x2goclient.pro | 4 ++-- x2goclientconfig.pri | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f5ac1d..23d29b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Reference src/ and src/i18n/ in x2goclient.pro. - Move *.ui files to src/ui/ and reference in x2goclient.pro. - Translate and simplify header in x2goclient.pro. + - Add x2goclientconfig.pri only containing a comment to override specific + entries in x2goclient.pro in x2goclientconfig.pri. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 4b4f0ae..b9f565d 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -1,8 +1,8 @@ # This file was created by KDevelop. # ------------------------------------------- -#include (x2goclientconfig.pri) - +# Override settings in this file. +include (x2goclientconfig.pri) CONFIG += $$(X2GO_CLIENT_TARGET) CONFIG += $$(X2GO_LINUX_STATIC) diff --git a/x2goclientconfig.pri b/x2goclientconfig.pri new file mode 100644 index 0000000..edc265b --- /dev/null +++ b/x2goclientconfig.pri @@ -0,0 +1 @@ +# Override settings specified in x2goclient.pro here. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 34bc8c0b9da3d89a8561f3787b7a3a40bf474dff Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:57:18 2015 +0100 general: move resource files to src/res/ and reference in x2goclient.pro. --- debian/changelog | 1 + changelog.rcc => src/res/changelog.rcc | 0 git.rcc => src/res/git.rcc | 0 resources.rcc => src/res/resources.rcc | 0 x2goclient.rc => src/res/x2goclient.rc | 0 x2goclient.pro | 8 ++++---- 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23d29b9..18ce527 100644 --- a/debian/changelog +++ b/debian/changelog @@ -98,6 +98,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Translate and simplify header in x2goclient.pro. - Add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. + - Move resource files to src/res/ and reference in x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/changelog.rcc b/src/res/changelog.rcc similarity index 100% rename from changelog.rcc rename to src/res/changelog.rcc diff --git a/git.rcc b/src/res/git.rcc similarity index 100% rename from git.rcc rename to src/res/git.rcc diff --git a/resources.rcc b/src/res/resources.rcc similarity index 100% rename from resources.rcc rename to src/res/resources.rcc diff --git a/x2goclient.rc b/src/res/x2goclient.rc similarity index 100% rename from x2goclient.rc rename to src/res/x2goclient.rc diff --git a/x2goclient.pro b/x2goclient.pro index b9f565d..dbb934c 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -125,7 +125,7 @@ plugin { TARGET = x2goplugin } else { - RC_FILE = x2goclient.rc + RC_FILE = src/res/x2goclient.rc SOURCES += src/x2goclient.cpp TARGET = x2goclient DEFINES += CFGCLIENT @@ -153,16 +153,16 @@ else:message(No translation files in project) TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . -RESOURCES += resources.rcc +RESOURCES += src/res/resources.rcc exists( txt/git-info ) { message( "Configuring with --git-info" ) - RESOURCES += git.rcc + RESOURCES += src/res/git.rcc } exists( txt/changelog ) { message( "Configuring with --changelog" ) - RESOURCES += changelog.rcc + RESOURCES += src/res/changelog.rcc } linux-g++ { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org