This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit b7398771a7abd84ddcff407063edb95dd0a205d3 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:03:21 2015 +0100 general: move *.cpp and *.h files to src/ and *.ts files to src/i18n/. --- debian/changelog | 4 ++++ LDAPSession.cpp => src/LDAPSession.cpp | 0 LDAPSession.h => src/LDAPSession.h | 0 SVGFrame.cpp => src/SVGFrame.cpp | 0 SVGFrame.h => src/SVGFrame.h | 0 appdialog.cpp => src/appdialog.cpp | 0 appdialog.h => src/appdialog.h | 0 brokerpassdlg.cpp => src/brokerpassdlg.cpp | 0 brokerpassdlg.h => src/brokerpassdlg.h | 0 clicklineedit.cpp => src/clicklineedit.cpp | 0 clicklineedit.h => src/clicklineedit.h | 0 configdialog.cpp => src/configdialog.cpp | 0 configdialog.h => src/configdialog.h | 0 configwidget.cpp => src/configwidget.cpp | 0 configwidget.h => src/configwidget.h | 0 connectionwidget.cpp => src/connectionwidget.cpp | 0 connectionwidget.h => src/connectionwidget.h | 0 contest.cpp => src/contest.cpp | 0 contest.h => src/contest.h | 0 cupsprint.cpp => src/cupsprint.cpp | 0 cupsprint.h => src/cupsprint.h | 0 .../cupsprintersettingsdialog.cpp | 0 .../cupsprintersettingsdialog.h | 0 cupsprintwidget.cpp => src/cupsprintwidget.cpp | 0 cupsprintwidget.h => src/cupsprintwidget.h | 0 .../editconnectiondialog.cpp | 0 .../editconnectiondialog.h | 0 exportdialog.cpp => src/exportdialog.cpp | 0 exportdialog.h => src/exportdialog.h | 0 folderbutton.cpp => src/folderbutton.cpp | 0 folderbutton.h => src/folderbutton.h | 0 folderexplorer.cpp => src/folderexplorer.cpp | 0 folderexplorer.h => src/folderexplorer.h | 0 helpdialog.cpp => src/helpdialog.cpp | 0 helpdialog.h => src/helpdialog.h | 0 httpbrokerclient.cpp => src/httpbrokerclient.cpp | 0 httpbrokerclient.h => src/httpbrokerclient.h | 0 x2goclient_da.ts => src/i18n/x2goclient_da.ts | 0 x2goclient_de.ts => src/i18n/x2goclient_de.ts | 0 x2goclient_es.ts => src/i18n/x2goclient_es.ts | 0 x2goclient_et.ts => src/i18n/x2goclient_et.ts | 0 x2goclient_fi.ts => src/i18n/x2goclient_fi.ts | 0 x2goclient_fr.ts => src/i18n/x2goclient_fr.ts | 0 .../i18n/x2goclient_nb_no.ts | 0 x2goclient_nl.ts => src/i18n/x2goclient_nl.ts | 0 x2goclient_pt.ts => src/i18n/x2goclient_pt.ts | 0 x2goclient_ru.ts => src/i18n/x2goclient_ru.ts | 0 x2goclient_sv.ts => src/i18n/x2goclient_sv.ts | 0 x2goclient_tr.ts => src/i18n/x2goclient_tr.ts | 0 .../i18n/x2goclient_zh_tw.ts | 0 imgframe.cpp => src/imgframe.cpp | 0 imgframe.h => src/imgframe.h | 0 mediawidget.cpp => src/mediawidget.cpp | 0 mediawidget.h => src/mediawidget.h | 0 ongetpass.cpp => src/ongetpass.cpp | 0 ongetpass.h => src/ongetpass.h | 0 onmainwindow.cpp => src/onmainwindow.cpp | 0 onmainwindow.h => src/onmainwindow.h | 0 onmainwindow_privat.h => src/onmainwindow_privat.h | 0 printdialog.cpp => src/printdialog.cpp | 0 printdialog.h => src/printdialog.h | 0 printercmddialog.cpp => src/printercmddialog.cpp | 0 printercmddialog.h => src/printercmddialog.h | 0 printprocess.cpp => src/printprocess.cpp | 0 printprocess.h => src/printprocess.h | 0 printwidget.cpp => src/printwidget.cpp | 0 printwidget.h => src/printwidget.h | 0 sessionbutton.cpp => src/sessionbutton.cpp | 0 sessionbutton.h => src/sessionbutton.h | 0 sessionexplorer.cpp => src/sessionexplorer.cpp | 0 sessionexplorer.h => src/sessionexplorer.h | 0 .../sessionmanagedialog.cpp | 0 sessionmanagedialog.h => src/sessionmanagedialog.h | 0 sessionwidget.cpp => src/sessionwidget.cpp | 0 sessionwidget.h => src/sessionwidget.h | 0 settingswidget.cpp => src/settingswidget.cpp | 0 settingswidget.h => src/settingswidget.h | 0 sharewidget.cpp => src/sharewidget.cpp | 0 sharewidget.h => src/sharewidget.h | 0 .../sshmasterconnection.cpp | 0 sshmasterconnection.h => src/sshmasterconnection.h | 0 sshprocess.cpp => src/sshprocess.cpp | 0 sshprocess.h => src/sshprocess.h | 0 userbutton.cpp => src/userbutton.cpp | 0 userbutton.h => src/userbutton.h | 0 version.h => src/version.h | 0 wapi.cpp => src/wapi.cpp | 0 wapi.h => src/wapi.h | 0 x2goclient.cpp => src/x2goclient.cpp | 0 x2goclientconfig.h => src/x2goclientconfig.h | 0 x2gologdebug.cpp => src/x2gologdebug.cpp | 0 x2gologdebug.h => src/x2gologdebug.h | 0 x2gosettings.cpp => src/x2gosettings.cpp | 0 x2gosettings.h => src/x2gosettings.h | 0 x2goutils.cpp => src/x2goutils.cpp | 0 x2goutils.h => src/x2goutils.h | 0 xsettingswidget.cpp => src/xsettingswidget.cpp | 0 xsettingswidget.h => src/xsettingswidget.h | 0 98 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 52c0157..b2301ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,10 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium * New upstream version (4.0.3.2): - Add Turkish translation file. + [ Mihai Moldovan ] + * New upstream version (4.0.3.2): + - Move *.cpp and *.h files to src/ and *.ts files to src/i18n/. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium diff --git a/LDAPSession.cpp b/src/LDAPSession.cpp similarity index 100% rename from LDAPSession.cpp rename to src/LDAPSession.cpp diff --git a/LDAPSession.h b/src/LDAPSession.h similarity index 100% rename from LDAPSession.h rename to src/LDAPSession.h diff --git a/SVGFrame.cpp b/src/SVGFrame.cpp similarity index 100% rename from SVGFrame.cpp rename to src/SVGFrame.cpp diff --git a/SVGFrame.h b/src/SVGFrame.h similarity index 100% rename from SVGFrame.h rename to src/SVGFrame.h diff --git a/appdialog.cpp b/src/appdialog.cpp similarity index 100% rename from appdialog.cpp rename to src/appdialog.cpp diff --git a/appdialog.h b/src/appdialog.h similarity index 100% rename from appdialog.h rename to src/appdialog.h diff --git a/brokerpassdlg.cpp b/src/brokerpassdlg.cpp similarity index 100% rename from brokerpassdlg.cpp rename to src/brokerpassdlg.cpp diff --git a/brokerpassdlg.h b/src/brokerpassdlg.h similarity index 100% rename from brokerpassdlg.h rename to src/brokerpassdlg.h diff --git a/clicklineedit.cpp b/src/clicklineedit.cpp similarity index 100% rename from clicklineedit.cpp rename to src/clicklineedit.cpp diff --git a/clicklineedit.h b/src/clicklineedit.h similarity index 100% rename from clicklineedit.h rename to src/clicklineedit.h diff --git a/configdialog.cpp b/src/configdialog.cpp similarity index 100% rename from configdialog.cpp rename to src/configdialog.cpp diff --git a/configdialog.h b/src/configdialog.h similarity index 100% rename from configdialog.h rename to src/configdialog.h diff --git a/configwidget.cpp b/src/configwidget.cpp similarity index 100% rename from configwidget.cpp rename to src/configwidget.cpp diff --git a/configwidget.h b/src/configwidget.h similarity index 100% rename from configwidget.h rename to src/configwidget.h diff --git a/connectionwidget.cpp b/src/connectionwidget.cpp similarity index 100% rename from connectionwidget.cpp rename to src/connectionwidget.cpp diff --git a/connectionwidget.h b/src/connectionwidget.h similarity index 100% rename from connectionwidget.h rename to src/connectionwidget.h diff --git a/contest.cpp b/src/contest.cpp similarity index 100% rename from contest.cpp rename to src/contest.cpp diff --git a/contest.h b/src/contest.h similarity index 100% rename from contest.h rename to src/contest.h diff --git a/cupsprint.cpp b/src/cupsprint.cpp similarity index 100% rename from cupsprint.cpp rename to src/cupsprint.cpp diff --git a/cupsprint.h b/src/cupsprint.h similarity index 100% rename from cupsprint.h rename to src/cupsprint.h diff --git a/cupsprintersettingsdialog.cpp b/src/cupsprintersettingsdialog.cpp similarity index 100% rename from cupsprintersettingsdialog.cpp rename to src/cupsprintersettingsdialog.cpp diff --git a/cupsprintersettingsdialog.h b/src/cupsprintersettingsdialog.h similarity index 100% rename from cupsprintersettingsdialog.h rename to src/cupsprintersettingsdialog.h diff --git a/cupsprintwidget.cpp b/src/cupsprintwidget.cpp similarity index 100% rename from cupsprintwidget.cpp rename to src/cupsprintwidget.cpp diff --git a/cupsprintwidget.h b/src/cupsprintwidget.h similarity index 100% rename from cupsprintwidget.h rename to src/cupsprintwidget.h diff --git a/editconnectiondialog.cpp b/src/editconnectiondialog.cpp similarity index 100% rename from editconnectiondialog.cpp rename to src/editconnectiondialog.cpp diff --git a/editconnectiondialog.h b/src/editconnectiondialog.h similarity index 100% rename from editconnectiondialog.h rename to src/editconnectiondialog.h diff --git a/exportdialog.cpp b/src/exportdialog.cpp similarity index 100% rename from exportdialog.cpp rename to src/exportdialog.cpp diff --git a/exportdialog.h b/src/exportdialog.h similarity index 100% rename from exportdialog.h rename to src/exportdialog.h diff --git a/folderbutton.cpp b/src/folderbutton.cpp similarity index 100% rename from folderbutton.cpp rename to src/folderbutton.cpp diff --git a/folderbutton.h b/src/folderbutton.h similarity index 100% rename from folderbutton.h rename to src/folderbutton.h diff --git a/folderexplorer.cpp b/src/folderexplorer.cpp similarity index 100% rename from folderexplorer.cpp rename to src/folderexplorer.cpp diff --git a/folderexplorer.h b/src/folderexplorer.h similarity index 100% rename from folderexplorer.h rename to src/folderexplorer.h diff --git a/helpdialog.cpp b/src/helpdialog.cpp similarity index 100% rename from helpdialog.cpp rename to src/helpdialog.cpp diff --git a/helpdialog.h b/src/helpdialog.h similarity index 100% rename from helpdialog.h rename to src/helpdialog.h diff --git a/httpbrokerclient.cpp b/src/httpbrokerclient.cpp similarity index 100% rename from httpbrokerclient.cpp rename to src/httpbrokerclient.cpp diff --git a/httpbrokerclient.h b/src/httpbrokerclient.h similarity index 100% rename from httpbrokerclient.h rename to src/httpbrokerclient.h diff --git a/x2goclient_da.ts b/src/i18n/x2goclient_da.ts similarity index 100% rename from x2goclient_da.ts rename to src/i18n/x2goclient_da.ts diff --git a/x2goclient_de.ts b/src/i18n/x2goclient_de.ts similarity index 100% rename from x2goclient_de.ts rename to src/i18n/x2goclient_de.ts diff --git a/x2goclient_es.ts b/src/i18n/x2goclient_es.ts similarity index 100% rename from x2goclient_es.ts rename to src/i18n/x2goclient_es.ts diff --git a/x2goclient_et.ts b/src/i18n/x2goclient_et.ts similarity index 100% rename from x2goclient_et.ts rename to src/i18n/x2goclient_et.ts diff --git a/x2goclient_fi.ts b/src/i18n/x2goclient_fi.ts similarity index 100% rename from x2goclient_fi.ts rename to src/i18n/x2goclient_fi.ts diff --git a/x2goclient_fr.ts b/src/i18n/x2goclient_fr.ts similarity index 100% rename from x2goclient_fr.ts rename to src/i18n/x2goclient_fr.ts diff --git a/x2goclient_nb_no.ts b/src/i18n/x2goclient_nb_no.ts similarity index 100% rename from x2goclient_nb_no.ts rename to src/i18n/x2goclient_nb_no.ts diff --git a/x2goclient_nl.ts b/src/i18n/x2goclient_nl.ts similarity index 100% rename from x2goclient_nl.ts rename to src/i18n/x2goclient_nl.ts diff --git a/x2goclient_pt.ts b/src/i18n/x2goclient_pt.ts similarity index 100% rename from x2goclient_pt.ts rename to src/i18n/x2goclient_pt.ts diff --git a/x2goclient_ru.ts b/src/i18n/x2goclient_ru.ts similarity index 100% rename from x2goclient_ru.ts rename to src/i18n/x2goclient_ru.ts diff --git a/x2goclient_sv.ts b/src/i18n/x2goclient_sv.ts similarity index 100% rename from x2goclient_sv.ts rename to src/i18n/x2goclient_sv.ts diff --git a/x2goclient_tr.ts b/src/i18n/x2goclient_tr.ts similarity index 100% rename from x2goclient_tr.ts rename to src/i18n/x2goclient_tr.ts diff --git a/x2goclient_zh_tw.ts b/src/i18n/x2goclient_zh_tw.ts similarity index 100% rename from x2goclient_zh_tw.ts rename to src/i18n/x2goclient_zh_tw.ts diff --git a/imgframe.cpp b/src/imgframe.cpp similarity index 100% rename from imgframe.cpp rename to src/imgframe.cpp diff --git a/imgframe.h b/src/imgframe.h similarity index 100% rename from imgframe.h rename to src/imgframe.h diff --git a/mediawidget.cpp b/src/mediawidget.cpp similarity index 100% rename from mediawidget.cpp rename to src/mediawidget.cpp diff --git a/mediawidget.h b/src/mediawidget.h similarity index 100% rename from mediawidget.h rename to src/mediawidget.h diff --git a/ongetpass.cpp b/src/ongetpass.cpp similarity index 100% rename from ongetpass.cpp rename to src/ongetpass.cpp diff --git a/ongetpass.h b/src/ongetpass.h similarity index 100% rename from ongetpass.h rename to src/ongetpass.h diff --git a/onmainwindow.cpp b/src/onmainwindow.cpp similarity index 100% rename from onmainwindow.cpp rename to src/onmainwindow.cpp diff --git a/onmainwindow.h b/src/onmainwindow.h similarity index 100% rename from onmainwindow.h rename to src/onmainwindow.h diff --git a/onmainwindow_privat.h b/src/onmainwindow_privat.h similarity index 100% rename from onmainwindow_privat.h rename to src/onmainwindow_privat.h diff --git a/printdialog.cpp b/src/printdialog.cpp similarity index 100% rename from printdialog.cpp rename to src/printdialog.cpp diff --git a/printdialog.h b/src/printdialog.h similarity index 100% rename from printdialog.h rename to src/printdialog.h diff --git a/printercmddialog.cpp b/src/printercmddialog.cpp similarity index 100% rename from printercmddialog.cpp rename to src/printercmddialog.cpp diff --git a/printercmddialog.h b/src/printercmddialog.h similarity index 100% rename from printercmddialog.h rename to src/printercmddialog.h diff --git a/printprocess.cpp b/src/printprocess.cpp similarity index 100% rename from printprocess.cpp rename to src/printprocess.cpp diff --git a/printprocess.h b/src/printprocess.h similarity index 100% rename from printprocess.h rename to src/printprocess.h diff --git a/printwidget.cpp b/src/printwidget.cpp similarity index 100% rename from printwidget.cpp rename to src/printwidget.cpp diff --git a/printwidget.h b/src/printwidget.h similarity index 100% rename from printwidget.h rename to src/printwidget.h diff --git a/sessionbutton.cpp b/src/sessionbutton.cpp similarity index 100% rename from sessionbutton.cpp rename to src/sessionbutton.cpp diff --git a/sessionbutton.h b/src/sessionbutton.h similarity index 100% rename from sessionbutton.h rename to src/sessionbutton.h diff --git a/sessionexplorer.cpp b/src/sessionexplorer.cpp similarity index 100% rename from sessionexplorer.cpp rename to src/sessionexplorer.cpp diff --git a/sessionexplorer.h b/src/sessionexplorer.h similarity index 100% rename from sessionexplorer.h rename to src/sessionexplorer.h diff --git a/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp similarity index 100% rename from sessionmanagedialog.cpp rename to src/sessionmanagedialog.cpp diff --git a/sessionmanagedialog.h b/src/sessionmanagedialog.h similarity index 100% rename from sessionmanagedialog.h rename to src/sessionmanagedialog.h diff --git a/sessionwidget.cpp b/src/sessionwidget.cpp similarity index 100% rename from sessionwidget.cpp rename to src/sessionwidget.cpp diff --git a/sessionwidget.h b/src/sessionwidget.h similarity index 100% rename from sessionwidget.h rename to src/sessionwidget.h diff --git a/settingswidget.cpp b/src/settingswidget.cpp similarity index 100% rename from settingswidget.cpp rename to src/settingswidget.cpp diff --git a/settingswidget.h b/src/settingswidget.h similarity index 100% rename from settingswidget.h rename to src/settingswidget.h diff --git a/sharewidget.cpp b/src/sharewidget.cpp similarity index 100% rename from sharewidget.cpp rename to src/sharewidget.cpp diff --git a/sharewidget.h b/src/sharewidget.h similarity index 100% rename from sharewidget.h rename to src/sharewidget.h diff --git a/sshmasterconnection.cpp b/src/sshmasterconnection.cpp similarity index 100% rename from sshmasterconnection.cpp rename to src/sshmasterconnection.cpp diff --git a/sshmasterconnection.h b/src/sshmasterconnection.h similarity index 100% rename from sshmasterconnection.h rename to src/sshmasterconnection.h diff --git a/sshprocess.cpp b/src/sshprocess.cpp similarity index 100% rename from sshprocess.cpp rename to src/sshprocess.cpp diff --git a/sshprocess.h b/src/sshprocess.h similarity index 100% rename from sshprocess.h rename to src/sshprocess.h diff --git a/userbutton.cpp b/src/userbutton.cpp similarity index 100% rename from userbutton.cpp rename to src/userbutton.cpp diff --git a/userbutton.h b/src/userbutton.h similarity index 100% rename from userbutton.h rename to src/userbutton.h diff --git a/version.h b/src/version.h similarity index 100% rename from version.h rename to src/version.h diff --git a/wapi.cpp b/src/wapi.cpp similarity index 100% rename from wapi.cpp rename to src/wapi.cpp diff --git a/wapi.h b/src/wapi.h similarity index 100% rename from wapi.h rename to src/wapi.h diff --git a/x2goclient.cpp b/src/x2goclient.cpp similarity index 100% rename from x2goclient.cpp rename to src/x2goclient.cpp diff --git a/x2goclientconfig.h b/src/x2goclientconfig.h similarity index 100% rename from x2goclientconfig.h rename to src/x2goclientconfig.h diff --git a/x2gologdebug.cpp b/src/x2gologdebug.cpp similarity index 100% rename from x2gologdebug.cpp rename to src/x2gologdebug.cpp diff --git a/x2gologdebug.h b/src/x2gologdebug.h similarity index 100% rename from x2gologdebug.h rename to src/x2gologdebug.h diff --git a/x2gosettings.cpp b/src/x2gosettings.cpp similarity index 100% rename from x2gosettings.cpp rename to src/x2gosettings.cpp diff --git a/x2gosettings.h b/src/x2gosettings.h similarity index 100% rename from x2gosettings.h rename to src/x2gosettings.h diff --git a/x2goutils.cpp b/src/x2goutils.cpp similarity index 100% rename from x2goutils.cpp rename to src/x2goutils.cpp diff --git a/x2goutils.h b/src/x2goutils.h similarity index 100% rename from x2goutils.h rename to src/x2goutils.h diff --git a/xsettingswidget.cpp b/src/xsettingswidget.cpp similarity index 100% rename from xsettingswidget.cpp rename to src/xsettingswidget.cpp diff --git a/xsettingswidget.h b/src/xsettingswidget.h similarity index 100% rename from xsettingswidget.h rename to src/xsettingswidget.h -- Alioth's /srv/git/code.x2go.org/x2goclient.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 9750d66915c74699c98c5590a75d72dbc167b631 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 20:18:16 2015 +0100 x2goclient.pro: reference files moved to src/ and src/i18n/. --- debian/changelog | 1 + x2goclient.pro | 197 +++++++++++++++++++++++++++--------------------------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9b850a..4c61320 100644 --- a/debian/changelog +++ b/debian/changelog @@ -119,6 +119,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium * New upstream version (4.0.3.2): - 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. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 1c41b20..54eaf91 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -22,104 +22,103 @@ FORMS += cupsprintsettingsdialog.ui \ helpdialog.ui \ folderexplorer.ui -TRANSLATIONS += \ - x2goclient_de.ts \ - x2goclient_da.ts \ - x2goclient_es.ts \ - x2goclient_et.ts \ - x2goclient_fi.ts \ - x2goclient_fr.ts \ - x2goclient_nb_no.ts \ - x2goclient_nl.ts \ - x2goclient_pt.ts \ - x2goclient_ru.ts \ - x2goclient_sv.ts \ - x2goclient_tr.ts \ - x2goclient_zh_tw.ts - -HEADERS += configdialog.h \ - editconnectiondialog.h \ - exportdialog.h \ - imgframe.h \ - LDAPSession.h \ - onmainwindow.h \ - sessionbutton.h \ - sessionmanagedialog.h \ - sshmasterconnection.h \ - sshprocess.h \ - SVGFrame.h \ - userbutton.h \ - x2goclientconfig.h \ - x2gologdebug.h \ - printprocess.h \ - cupsprint.h \ - cupsprintwidget.h \ - cupsprintersettingsdialog.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - mediawidget.h \ - sharewidget.h \ - clicklineedit.h \ - httpbrokerclient.h \ - ongetpass.h \ - onmainwindow_privat.h \ - x2gosettings.h \ - brokerpassdlg.h \ - contest.h \ - xsettingswidget.h \ - appdialog.h \ - x2goutils.h \ - helpdialog.h \ - sessionexplorer.h \ - folderbutton.h \ - folderexplorer.h - -SOURCES += sharewidget.cpp \ - settingswidget.cpp \ - mediawidget.cpp \ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - onmainwindow.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshmasterconnection.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - cupsprint.cpp \ - cupsprintwidget.cpp \ - cupsprintersettingsdialog.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - wapi.cpp \ - clicklineedit.cpp \ - httpbrokerclient.cpp \ - ongetpass.cpp \ - x2gosettings.cpp \ - brokerpassdlg.cpp \ - contest.cpp \ - xsettingswidget.cpp \ - appdialog.cpp \ - x2goutils.cpp \ - helpdialog.cpp \ - sessionexplorer.cpp \ - folderbutton.cpp \ - folderexplorer.cpp +TRANSLATIONS += src/i18n/x2goclient_de.ts \ + src/i18n/x2goclient_da.ts \ + src/i18n/x2goclient_es.ts \ + src/i18n/x2goclient_et.ts \ + src/i18n/x2goclient_fi.ts \ + src/i18n/x2goclient_fr.ts \ + src/i18n/x2goclient_nb_no.ts \ + src/i18n/x2goclient_nl.ts \ + src/i18n/x2goclient_pt.ts \ + src/i18n/x2goclient_ru.ts \ + src/i18n/x2goclient_sv.ts \ + src/i18n/x2goclient_tr.ts \ + src/i18n/x2goclient_zh_tw.ts + +HEADERS += src/configdialog.h \ + src/editconnectiondialog.h \ + src/exportdialog.h \ + src/imgframe.h \ + src/LDAPSession.h \ + src/onmainwindow.h \ + src/sessionbutton.h \ + src/sessionmanagedialog.h \ + src/sshmasterconnection.h \ + src/sshprocess.h \ + src/SVGFrame.h \ + src/userbutton.h \ + src/x2goclientconfig.h \ + src/x2gologdebug.h \ + src/printprocess.h \ + src/cupsprint.h \ + src/cupsprintwidget.h \ + src/cupsprintersettingsdialog.h \ + src/printwidget.h \ + src/printercmddialog.h \ + src/printdialog.h \ + src/wapi.h \ + src/sessionwidget.h \ + src/configwidget.h \ + src/connectionwidget.h \ + src/settingswidget.h \ + src/mediawidget.h \ + src/sharewidget.h \ + src/clicklineedit.h \ + src/httpbrokerclient.h \ + src/ongetpass.h \ + src/onmainwindow_privat.h \ + src/x2gosettings.h \ + src/brokerpassdlg.h \ + src/contest.h \ + src/xsettingswidget.h \ + src/appdialog.h \ + src/x2goutils.h \ + src/helpdialog.h \ + src/sessionexplorer.h \ + src/folderbutton.h \ + src/folderexplorer.h + +SOURCES += src/sharewidget.cpp \ + src/settingswidget.cpp \ + src/mediawidget.cpp \ + src/configwidget.cpp \ + src/sessionwidget.cpp \ + src/connectionwidget.cpp \ + src/configdialog.cpp \ + src/editconnectiondialog.cpp \ + src/exportdialog.cpp \ + src/imgframe.cpp \ + src/LDAPSession.cpp \ + src/onmainwindow.cpp \ + src/sessionbutton.cpp \ + src/sessionmanagedialog.cpp \ + src/sshmasterconnection.cpp \ + src/sshprocess.cpp \ + src/SVGFrame.cpp \ + src/userbutton.cpp \ + src/x2gologdebug.cpp \ + src/printprocess.cpp \ + src/cupsprint.cpp \ + src/cupsprintwidget.cpp \ + src/cupsprintersettingsdialog.cpp \ + src/printwidget.cpp \ + src/printercmddialog.cpp \ + src/printdialog.cpp \ + src/wapi.cpp \ + src/clicklineedit.cpp \ + src/httpbrokerclient.cpp \ + src/ongetpass.cpp \ + src/x2gosettings.cpp \ + src/brokerpassdlg.cpp \ + src/contest.cpp \ + src/xsettingswidget.cpp \ + src/appdialog.cpp \ + src/x2goutils.cpp \ + src/helpdialog.cpp \ + src/sessionexplorer.cpp \ + src/folderbutton.cpp \ + src/folderexplorer.cpp LIBS += -lssh win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 @@ -129,7 +128,7 @@ plugin { } else { RC_FILE = x2goclient.rc - SOURCES += x2goclient.cpp + SOURCES += src/x2goclient.cpp TARGET = x2goclient DEFINES += CFGCLIENT message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) -- Alioth's /srv/git/code.x2go.org/x2goclient.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 034c8f558505d95b0b5635cd3d0d19b3ec0f9f9a 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 4c61320..8239814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -120,6 +120,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; 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. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +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/code.x2go.org/x2goclient.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 0c0925d02de205f0f79b61d4fcf8ad7bbf56889e 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 8126932..a95bd17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; 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. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +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/code.x2go.org/x2goclient.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 78564f03bd7e6407f8c7261452febf19cbeb615f 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 a95bd17..3acf01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; 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. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +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/code.x2go.org/x2goclient.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 84b49d9a79e340fc167022048a1e00ca08145598 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:06:47 2015 +0100 Makefile: rename SRC_DIR to TOP_DIR. --- Makefile | 6 +++--- debian/changelog | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 916716f..5437c3e 100755 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ #!/usr/bin/make -f -SRC_DIR=$(CURDIR) -CLIENT_DIR=$(SRC_DIR)/client_build +TOP_DIR=$(CURDIR) +CLIENT_DIR=$(TOP_DIR)/client_build CLIENT_BINARY=$(CLIENT_DIR)/x2goclient -PLUGIN_DIR=$(SRC_DIR)/plugin_build +PLUGIN_DIR=$(TOP_DIR)/plugin_build PLUGIN_BINARY=$(PLUGIN_DIR)/libx2goplugin.so SHELL=/bin/bash diff --git a/debian/changelog b/debian/changelog index 8755cf9..f949702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,6 +126,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium entries in x2goclient.pro in x2goclientconfig.pri. - Move resource files to src/res/ and reference in x2goclient.pro. - Reference changes in shipped Makefile. + - Rename SRC_DIR to TOP_DIR in shipped Makefile. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 4f26b347d083eefd56cb3c2dbdf65588174e63af Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:26:54 2015 +0100 x2goclient.pro: remove executability. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 285847e..3696f2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -131,6 +131,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium reference in x2goclient.pro. - Move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro. + - Remove executability from x2goclient.pro. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro old mode 100755 new mode 100644 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 91a7ceae6ea077fbc05b7c5f65498e0828e26d34 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:43:41 2015 +0100 HOWTO.GPGCARD: fix typos and grammar. --- HOWTO.GPGCARD | 12 ++++++------ debian/changelog | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HOWTO.GPGCARD b/HOWTO.GPGCARD index ff56a41..39cc88f 100644 --- a/HOWTO.GPGCARD +++ b/HOWTO.GPGCARD @@ -100,7 +100,7 @@ IMPORTANT: login Name is a name of user on remote system 2.1 start gpg-agent with ssh support Be sure, that pinentry-x2go is installed. For test purposes you can use other pinentry program, but for -x2goclient pinentry-x2go is requered (pinentry-x2go-gtk if you are using gtk version of x2goclient) +x2goclient pinentry-x2go is required (pinentry-x2go-gtk if you are using the gtk-version of x2goclient) user@x2goclient$ gpg-agent --enable-ssh-support --daemon --pinentry-program /usr/bin/pinentry-x2go GPG_AGENT_INFO=/tmp/gpg-Xh4lY7/S.gpg-agent:24620:1; export GPG_AGENT_INFO; @@ -112,18 +112,18 @@ user@x2goclient$ GPG_AGENT_INFO=/tmp/gpg-Xh4lY7/S.gpg-agent:24620:1; export GPG_ user@x2goclient$ SSH_AUTH_SOCK=/tmp/gpg-LO41WU/S.gpg-agent.ssh; export SSH_AUTH_SOCK; user@x2goclient$ SSH_AGENT_PID=24620; export SSH_AGENT_PID; -2.3 You can check the key on your smartcard with command: +2.3 You can check the key on your smartcard with: user@x2goclient$ ssh-add -l 1024 ef:d5:8c:37:cb:38:01:8d:c2:30:00:ac:93:a2:43:98 cardno:000000000042 (RSA) -2.4 Copy public part of your key to remote computer +2.4 Copy the public part of your key to the remote computer user@x2goclient$ ssh-copy-id beispielb@x2goserver beispielb@x2goserver's password: -Now try logging into the machine, with "ssh 'beispielb@x2goserver'", and check in: +Now try logging in into the machine, e.g., via "ssh 'beispielb@x2goserver'", and check: - .ssh/authorized_keys + ~/.ssh/authorized_keys to make sure we haven't added extra keys that you weren't expecting. 2.5 Testing ssh connection - +TBD diff --git a/debian/changelog b/debian/changelog index 361fcfb..affb9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium x2goclient.pro. - Remove executability from x2goclient.pro. - Fix typos and update URL's in INSTALL file. + - Fix typos and grammar in HOWTO.GPGCARD. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 e3413c44a0e630909694bd669cebb804d47f23ee Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 22:13:32 2015 +0100 README.OpenSSL-Exception: reformat content. --- README.OpenSSL-Exception | 24 ++++++++++++------------ debian/changelog | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.OpenSSL-Exception b/README.OpenSSL-Exception index 817daf5..98454f2 100644 --- a/README.OpenSSL-Exception +++ b/README.OpenSSL-Exception @@ -1,12 +1,12 @@ - * In addition, as a special exception, the copyright holders give - * permission to link the code of portions of this program with the - * OpenSSL library under certain conditions as described in each - * individual source file, and distribute linked combinations - * including the two. - * You must obey the GNU General Public License in all respects - * for all of the code used other than OpenSSL. If you modify - * file(s) with this exception, you may extend this exception to your - * version of the file(s), but you are not obligated to do so. If you - * do not wish to do so, delete this exception statement from your - * version. If you delete this exception statement from all source - * files in the program, then also delete it here. +In addition, as a special exception, the copyright holders give +permission to link the code of portions of this program with the +OpenSSL library under certain conditions as described in each +individual source file, and distribute linked combinations +including the two. +You must obey the GNU General Public License in all respects +for all of the code used other than OpenSSL. If you modify +file(s) with this exception, you may extend this exception to your +version of the file(s), but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from your +version. If you delete this exception statement from all source +files in the program, then also delete it here. diff --git a/debian/changelog b/debian/changelog index dd96e73..a27a869 100644 --- a/debian/changelog +++ b/debian/changelog @@ -137,6 +137,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Add "X2Go Project" copyright to LICENSE file. - Replace backticks with $() and change spaces to tabs in Makefile.man2html. + - Reformat README.OpenSSL-Exception. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 bc56aa64986a66766808cb36b1ce025bd9c1acce Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 22:19:22 2015 +0100 README.i18n: grammar fix. --- README.i18n | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.i18n b/README.i18n index 380414a..36b79bb 100644 --- a/README.i18n +++ b/README.i18n @@ -83,8 +83,8 @@ Next time... You will get informed on x2go-i18n if a translation update is necessary. So check your mails there regularly. -For updating a translation, either keep the X2Go Client source project folder and -read more about Git by yourself. +For updating a translation, keep the X2Go Client source project folder and read +more about Git by yourself. Alternatively, just remove the folder (once you have sent in the translation file) and start with this documentation all over again. diff --git a/debian/changelog b/debian/changelog index a27a869..6cc1a70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -138,6 +138,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Replace backticks with $() and change spaces to tabs in Makefile.man2html. - Reformat README.OpenSSL-Exception. + - Grammar fix in README.i18n. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 e55716140c2c4ac6b2155bd724db349cf870661f Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:04:44 2015 +0100 Move icons/ to img/icons/ and update references in: - resources.rcc - COPYRIGHT.x2go-logos - Makefile - debian/x2goclient.install - macbuild.sh - nsis/x2goclient.nsi - src/onmainwindow.cpp - src/appdialog.cpp - src/folderbutton.cpp - src/folderexplorer.cpp - src/sessionbutton.cpp - src/sessionexplorer.cpp - src/sessionmanagedialog.cpp - src/sessionwidget.cpp - src/ui/helpdialog.ui - src/xsettingswidget.cpp --- COPYRIGHT.x2go-logos | 10 +-- Makefile | 14 ++--- debian/changelog | 6 ++ debian/x2goclient.install | 14 ++--- macbuild.sh | 2 +- nsis/x2goclient.nsi | 4 +- resources.rcc | 142 +++++++++++++++++++++---------------------- src/appdialog.cpp | 22 +++---- src/folderbutton.cpp | 2 +- src/folderexplorer.cpp | 4 +- src/onmainwindow.cpp | 72 +++++++++++----------- src/sessionbutton.cpp | 4 +- src/sessionexplorer.cpp | 4 +- src/sessionmanagedialog.cpp | 2 +- src/sessionwidget.cpp | 4 +- src/ui/helpdialog.ui | 2 +- src/xsettingswidget.cpp | 2 +- x2goclient.pro | 2 +- x2goclient.rc | 2 +- 19 files changed, 160 insertions(+), 154 deletions(-) diff --git a/COPYRIGHT.x2go-logos b/COPYRIGHT.x2go-logos index 29a67a8..2b21e9f 100644 --- a/COPYRIGHT.x2go-logos +++ b/COPYRIGHT.x2go-logos @@ -13,10 +13,10 @@ License: GPL-2.0+ Copyright: 2005-2015 Heinz-M. Grasesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ -Files: icons/16x16/x2goclient.png - icons/32x32/x2goclient.png - icons/48x48/x2goclient.png - icons/64x64/x2goclient.png - icons/128x128/x2goclient.png +Files: img/icons/16x16/x2goclient.png + img/icons/32x32/x2goclient.png + img/icons/48x48/x2goclient.png + img/icons/64x64/x2goclient.png + img/icons/128x128/x2goclient.png Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ diff --git a/Makefile b/Makefile index 5437c3e..4f95d9c 100755 --- a/Makefile +++ b/Makefile @@ -83,13 +83,13 @@ install_client: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps $(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient $(DESTDIR)$(BINDIR)/x2goclient $(INSTALL_FILE) desktop/x2goclient.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goclient.desktop - $(INSTALL_FILE) icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm - $(INSTALL_FILE) icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png - $(INSTALL_FILE) icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png - $(INSTALL_FILE) icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png - $(INSTALL_FILE) icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png - $(INSTALL_FILE) icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png - $(INSTALL_FILE) icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png + $(INSTALL_FILE) img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm + $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png + $(INSTALL_FILE) img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png + $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png + $(INSTALL_FILE) img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png + $(INSTALL_FILE) img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png + $(INSTALL_FILE) img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png install_plugin: $(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/ diff --git a/debian/changelog b/debian/changelog index 9a0ad6b..8d4a20a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,6 +144,12 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium around messages, remove or add whitespace where applicable. - Move *.rc and *.rcc files back to top directory for now. Resources must be in the resource file's base directory or a sub-directory. + - Move icons/ to img/icons/ and update references in resources.rcc, + COPYRIGHT.x2go-logos, Makefile, debian/x2goclient.install, macbuild.sh, + nsis/x2goclient.nsi, src/onmainwindow.cpp, src/appdialog.cpp, + src/folderbutton.cpp, src/folderexplorer.cpp, src/sessionbutton.cpp, + src/sessionexplorer.cpp, src/sessionmanagedialog.cpp, + src/sessionwidget.cpp, src/ui/helpdialog.ui and src/xsettingswidget.cpp. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/x2goclient.install b/debian/x2goclient.install index 8a9b052..04ba470 100644 --- a/debian/x2goclient.install +++ b/debian/x2goclient.install @@ -1,9 +1,9 @@ client_build/x2goclient usr/bin desktop/x2goclient.desktop usr/share/applications/ -icons/x2goclient.xpm usr/share/x2goclient/icons/ -icons/128x128/x2goclient.png usr/share/x2goclient/icons/ -icons/128x128/x2gosession.png usr/share/x2goclient/icons/ -icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ -icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ -icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ -icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ +img/icons/x2goclient.xpm usr/share/x2goclient/icons/ +img/icons/128x128/x2goclient.png usr/share/x2goclient/icons/ +img/icons/128x128/x2gosession.png usr/share/x2goclient/icons/ +img/icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ +img/icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ +img/icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ +img/icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ diff --git a/macbuild.sh b/macbuild.sh index 70084e6..115718c 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -64,5 +64,5 @@ $PKG_DMG \ --copy "./LICENSE" \ --copy "./COPYING" \ --symlink "/Applications: " \ - --icon "./icons/x2go-mac.icns" \ + --icon "./img/icons/x2go-mac.icns" \ --format "UDBZ" diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 11d385c..285a80c 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -15,8 +15,8 @@ Name "x2goclient ${VERSION}" Caption "x2goclient ${VERSION}" OutFile "x2goclient-${VERSION}-setup.exe" - !define MUI_ICON icons\win-install.ico - !define MUI_UNICON icons\win-uninstall.ico + !define MUI_ICON img\icons\win-install.ico + !define MUI_UNICON img\icons\win-uninstall.ico ;Default installation folder InstallDir "$PROGRAMFILES\x2goclient" diff --git a/resources.rcc b/resources.rcc index 6c818ae..048cf2e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -15,77 +15,77 @@ <file>png/sess_ico.png</file> <file>png/ico_440x180.png</file> <file>png/power-button.png</file> - <file>icons/128x128/x2go.png</file> - <file>icons/128x128/folder.png</file> - <file>icons/128x128/x2gosession.png</file> - <file>icons/128x128/create_file.png</file> - <file>icons/128x128/lxde.png</file> - <file>icons/128x128/preferences.png</file> - <file>icons/128x128/rdp.png</file> - <file>icons/64x64/audio.png</file> - <file>icons/64x64/personal.png</file> - <file>icons/64x64/create_file.png</file> - <file>icons/64x64/lxde.png</file> - <file>icons/64x64/preferences.png</file> - <file>icons/64x64/rdp.png</file> - <file>icons/32x32/edit.png</file> - <file>icons/32x32/edit_settings.png</file> - <file>icons/32x32/exit.png</file> - <file>icons/32x32/file-open.png</file> - <file>icons/32x32/new_file.png</file> - <file>icons/32x32/create_file.png</file> - <file>icons/32x32/lxde.png</file> - <file>icons/32x32/preferences.png</file> - <file>icons/32x32/rdp.png</file> - <file>icons/32x32/reconnect.png</file> - <file>icons/32x32/tbhide.png</file> - <file>icons/32x32/tbshow.png</file> - <file>icons/32x32/attach.png</file> - <file>icons/32x32/detach.png</file> - <file>icons/32x32/suspend.png</file> - <file>icons/32x32/stop.png</file> - <file>icons/32x32/auth.png</file> - <file>icons/32x32/x2goclient.png</file> - <file>icons/32x32/resolution.png</file> - <file>icons/32x32/contest.png</file> - <file>icons/32x32/apps.png</file> - <file>icons/32x32/open_dir.png</file> - <file>icons/32x32/suspend_session.png</file> - <file>icons/32x32/stop_session.png</file> - <file>icons/16x16/audio.png</file> - <file>icons/16x16/file-open.png</file> - <file>icons/16x16/delete.png</file> - <file>icons/16x16/edit.png</file> - <file>icons/16x16/gnome.png</file> - <file>icons/16x16/unity.png</file> - <file>icons/16x16/xfce.png</file> - <file>icons/16x16/mate.png</file> - <file>icons/16x16/kde.png</file> - <file>icons/16x16/cinnamon.png</file> - <file>icons/16x16/trinity.png</file> - <file>icons/16x16/openbox.png</file> - <file>icons/16x16/icewm.png</file> - <file>icons/16x16/new_file.png</file> - <file>icons/16x16/resolution.png</file> - <file>icons/16x16/session.png</file> - <file>icons/16x16/x2go.png</file> - <file>icons/16x16/tbshow.png</file> - <file>icons/16x16/X.png</file> - <file>icons/16x16/create_file.png</file> - <file>icons/16x16/lxde.png</file> - <file>icons/16x16/preferences.png</file> - <file>icons/16x16/rdp.png</file> - <file>icons/22x22/applications-development.png</file> - <file>icons/22x22/applications-education.png</file> - <file>icons/22x22/applications-games.png</file> - <file>icons/22x22/applications-graphics.png</file> - <file>icons/22x22/applications-internet.png</file> - <file>icons/22x22/applications-multimedia.png</file> - <file>icons/22x22/applications-office.png</file> - <file>icons/22x22/applications-other.png</file> - <file>icons/22x22/applications-system.png</file> - <file>icons/22x22/applications-utilities.png</file> - <file>icons/22x22/preferences-system.png</file> + <file>img/icons/128x128/x2go.png</file> + <file>img/icons/128x128/folder.png</file> + <file>img/icons/128x128/x2gosession.png</file> + <file>img/icons/128x128/create_file.png</file> + <file>img/icons/128x128/lxde.png</file> + <file>img/icons/128x128/preferences.png</file> + <file>img/icons/128x128/rdp.png</file> + <file>img/icons/64x64/audio.png</file> + <file>img/icons/64x64/personal.png</file> + <file>img/icons/64x64/create_file.png</file> + <file>img/icons/64x64/lxde.png</file> + <file>img/icons/64x64/preferences.png</file> + <file>img/icons/64x64/rdp.png</file> + <file>img/icons/32x32/edit.png</file> + <file>img/icons/32x32/edit_settings.png</file> + <file>img/icons/32x32/exit.png</file> + <file>img/icons/32x32/file-open.png</file> + <file>img/icons/32x32/new_file.png</file> + <file>img/icons/32x32/create_file.png</file> + <file>img/icons/32x32/lxde.png</file> + <file>img/icons/32x32/preferences.png</file> + <file>img/icons/32x32/rdp.png</file> + <file>img/icons/32x32/reconnect.png</file> + <file>img/icons/32x32/tbhide.png</file> + <file>img/icons/32x32/tbshow.png</file> + <file>img/icons/32x32/attach.png</file> + <file>img/icons/32x32/detach.png</file> + <file>img/icons/32x32/suspend.png</file> + <file>img/icons/32x32/stop.png</file> + <file>img/icons/32x32/auth.png</file> + <file>img/icons/32x32/x2goclient.png</file> + <file>img/icons/32x32/resolution.png</file> + <file>img/icons/32x32/contest.png</file> + <file>img/icons/32x32/apps.png</file> + <file>img/icons/32x32/open_dir.png</file> + <file>img/icons/32x32/suspend_session.png</file> + <file>img/icons/32x32/stop_session.png</file> + <file>img/icons/16x16/audio.png</file> + <file>img/icons/16x16/file-open.png</file> + <file>img/icons/16x16/delete.png</file> + <file>img/icons/16x16/edit.png</file> + <file>img/icons/16x16/gnome.png</file> + <file>img/icons/16x16/unity.png</file> + <file>img/icons/16x16/xfce.png</file> + <file>img/icons/16x16/mate.png</file> + <file>img/icons/16x16/kde.png</file> + <file>img/icons/16x16/cinnamon.png</file> + <file>img/icons/16x16/trinity.png</file> + <file>img/icons/16x16/openbox.png</file> + <file>img/icons/16x16/icewm.png</file> + <file>img/icons/16x16/new_file.png</file> + <file>img/icons/16x16/resolution.png</file> + <file>img/icons/16x16/session.png</file> + <file>img/icons/16x16/x2go.png</file> + <file>img/icons/16x16/tbshow.png</file> + <file>img/icons/16x16/X.png</file> + <file>img/icons/16x16/create_file.png</file> + <file>img/icons/16x16/lxde.png</file> + <file>img/icons/16x16/preferences.png</file> + <file>img/icons/16x16/rdp.png</file> + <file>img/icons/22x22/applications-development.png</file> + <file>img/icons/22x22/applications-education.png</file> + <file>img/icons/22x22/applications-games.png</file> + <file>img/icons/22x22/applications-graphics.png</file> + <file>img/icons/22x22/applications-internet.png</file> + <file>img/icons/22x22/applications-multimedia.png</file> + <file>img/icons/22x22/applications-office.png</file> + <file>img/icons/22x22/applications-other.png</file> + <file>img/icons/22x22/applications-system.png</file> + <file>img/icons/22x22/applications-utilities.png</file> + <file>img/icons/22x22/preferences-system.png</file> <file>txt/packs</file> <file>txt/encodings</file> <file>x2goclient_da.qm</file> diff --git a/src/appdialog.cpp b/src/appdialog.cpp index a9dc739..0d2a5f6 100644 --- a/src/appdialog.cpp +++ b/src/appdialog.cpp @@ -99,57 +99,57 @@ void AppDialog::loadApps() { case Application::MULTIMEDIA: if (!media) - media=initTopItem(tr("Multimedia"), QPixmap(":/icons/22x22/applications-multimedia.png")); + media=initTopItem(tr("Multimedia"), QPixmap(":/img/icons/22x22/applications-multimedia.png")); parent=media; break; case Application::DEVELOPMENT: if (!dev) - dev=initTopItem(tr("Development"), QPixmap(":/icons/22x22/applications-development.png")); + dev=initTopItem(tr("Development"), QPixmap(":/img/icons/22x22/applications-development.png")); parent=dev; break; case Application::EDUCATION: if (!edu) - edu=initTopItem(tr("Education"), QPixmap(":/icons/22x22/applications-education.png")); + edu=initTopItem(tr("Education"), QPixmap(":/img/icons/22x22/applications-education.png")); parent=edu; break; case Application::GAME: if (!game) - game=initTopItem(tr("Game"), QPixmap(":/icons/22x22/applications-games.png")); + game=initTopItem(tr("Game"), QPixmap(":/img/icons/22x22/applications-games.png")); parent=game; break; case Application::GRAPHICS: if (!graph) - graph=initTopItem(tr("Graphics"), QPixmap(":/icons/22x22/applications-graphics.png")); + graph=initTopItem(tr("Graphics"), QPixmap(":/img/icons/22x22/applications-graphics.png")); parent=graph; break; case Application::NETWORK: if (!net) - net=initTopItem(tr("Network"), QPixmap(":/icons/22x22/applications-internet.png")); + net=initTopItem(tr("Network"), QPixmap(":/img/icons/22x22/applications-internet.png")); parent=net; break; case Application::OFFICE: if (!office) - office=initTopItem(tr("Office"), QPixmap(":/icons/22x22/applications-office.png")); + office=initTopItem(tr("Office"), QPixmap(":/img/icons/22x22/applications-office.png")); parent=office; break; case Application::SETTINGS: if (!set) - set=initTopItem(tr("Settings"), QPixmap(":/icons/22x22/preferences-system.png")); + set=initTopItem(tr("Settings"), QPixmap(":/img/icons/22x22/preferences-system.png")); parent=set; break; case Application::SYSTEM: if (!sys) - sys=initTopItem(tr("System"), QPixmap(":/icons/22x22/applications-system.png")); + sys=initTopItem(tr("System"), QPixmap(":/img/icons/22x22/applications-system.png")); parent=sys; break; case Application::UTILITY: if (!util) - util=initTopItem(tr("Utility"), QPixmap(":/icons/22x22/applications-utilities.png")); + util=initTopItem(tr("Utility"), QPixmap(":/img/icons/22x22/applications-utilities.png")); parent=util; break; case Application::OTHER: if (!other) - other=initTopItem(tr("Other"), QPixmap(":/icons/22x22/applications-other.png")); + other=initTopItem(tr("Other"), QPixmap(":/img/icons/22x22/applications-other.png")); parent=other; break; } diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp index ebdc917..c6b571a 100644 --- a/src/folderbutton.cpp +++ b/src/folderbutton.cpp @@ -106,7 +106,7 @@ void FolderButton::loadIcon() else st= new X2goSettings( "sessions" ); - QString sessIcon=":icons/128x128/folder.png"; + QString sessIcon=":/img/icons/128x128/folder.png"; QPixmap* pix; QString normPath=(path+"/"+name).split("/",QString::SkipEmptyParts).join("::"); diff --git a/src/folderexplorer.cpp b/src/folderexplorer.cpp index c9fcaf5..8694d77 100644 --- a/src/folderexplorer.cpp +++ b/src/folderexplorer.cpp @@ -29,7 +29,7 @@ FolderExplorer::FolderExplorer(QString path, SessionExplorer* explorer, QWidget* this->explorer=explorer; root=new QTreeWidgetItem(treeWidget); root->setText(0,"/"); - root->setIcon(0,QIcon(":icons/128x128/folder.png")); + root->setIcon(0,QIcon(":/img/icons/128x128/folder.png")); currentPath=path; initFolders(root, ""); root->setExpanded(true); @@ -144,7 +144,7 @@ void FolderExplorer::slotNewFolder() QTreeWidgetItem* it=new QTreeWidgetItem(menuItem); QString name=tr("New Folder"); it->setText(0,name); - it->setIcon(0, QIcon(":icons/128x128/folder.png")); + it->setIcon(0, QIcon(":/img/icons/128x128/folder.png")); QString normPath=(menuItem->data(0,Qt::UserRole).toString()+"/"+name).split("/",QString::SkipEmptyParts).join("/"); it->setData(0,Qt::UserRole, normPath+"/"); treeWidget->clearSelection(); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 3c29870..ee08fb6 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -389,7 +389,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) } - act_abclient=new QAction ( QIcon ( ":icons/32x32/x2goclient.png" ), + act_abclient=new QAction ( QIcon ( ":/img/icons/32x32/x2goclient.png" ), tr ( "About X2GO client" ),this ); @@ -591,25 +591,25 @@ void ONMainWindow::initWidgetsEmbed() #endif - act_shareFolder=new QAction ( QIcon ( ":icons/32x32/file-open.png" ), + act_shareFolder=new QAction ( QIcon ( ":/img/icons/32x32/file-open.png" ), tr ( "Share folder..." ),this ); - act_showApps=new QAction ( QIcon ( ":icons/32x32/apps.png" ), + act_showApps=new QAction ( QIcon ( ":/img/icons/32x32/apps.png" ), tr ( "Applications..." ),this ); - act_suspend=new QAction ( QIcon ( ":icons/32x32/suspend.png" ), + act_suspend=new QAction ( QIcon ( ":/img/icons/32x32/suspend.png" ), tr ( "Suspend" ),this ); - act_terminate=new QAction ( QIcon ( ":icons/32x32/stop.png" ), + act_terminate=new QAction ( QIcon ( ":/img/icons/32x32/stop.png" ), tr ( "Terminate" ),this ); - act_reconnect=new QAction ( QIcon ( ":icons/32x32/reconnect.png" ), + act_reconnect=new QAction ( QIcon ( ":/img/icons/32x32/reconnect.png" ), tr ( "Reconnect" ),this ); act_reconnect->setEnabled ( false ); - act_embedContol=new QAction ( QIcon ( ":icons/32x32/detach.png" ), + act_embedContol=new QAction ( QIcon ( ":/img/icons/32x32/detach.png" ), tr ( "Detach X2Go window" ),this ); - act_embedToolBar=new QAction ( QIcon ( ":icons/32x32/tbhide.png" ), + act_embedToolBar=new QAction ( QIcon ( ":/img/icons/32x32/tbhide.png" ), tr ( "Minimize toolbar" ),this ); @@ -796,7 +796,7 @@ void ONMainWindow::initWidgetsNormal() act_new->setShortcut ( tr ( "Ctrl+N" ) ); - setWindowIcon ( QIcon ( ":icons/128x128/x2go.png" ) ); + setWindowIcon ( QIcon ( ":/img/icons/128x128/x2go.png" ) ); act_edit=new QAction ( QIcon ( iconsPath ( "/32x32/edit.png" ) ), tr ( "Session management..." ),this ); act_edit->setShortcut ( tr ( "Ctrl+E" ) ); @@ -1000,7 +1000,7 @@ void ONMainWindow::slotGetBrokerAuth() { pass->clear(); login->clear(); - QString pixFile=":icons/128x128/x2gosession.png"; + QString pixFile=":/img/icons/128x128/x2gosession.png"; if (SPixFile!=QString::null) pixFile=SPixFile; QPixmap pix(pixFile); @@ -1082,27 +1082,27 @@ void ONMainWindow::trayIconInit() trayIconActiveConnectionMenu = trayIconMenu->addMenu(tr("Not connected")); appMenu[Application::MULTIMEDIA]=initTrayAppMenu(tr("Multimedia"), - QPixmap(":/icons/22x22/applications-multimedia.png")); + QPixmap(":/img/icons/22x22/applications-multimedia.png")); appMenu[Application::DEVELOPMENT]=initTrayAppMenu(tr("Development"), - QPixmap(":/icons/22x22/applications-development.png")); + QPixmap(":/img/icons/22x22/applications-development.png")); appMenu[Application::EDUCATION]=initTrayAppMenu(tr("Education"), - QPixmap(":/icons/22x22/applications-education.png")); + QPixmap(":/img/icons/22x22/applications-education.png")); appMenu[Application::GAME]=initTrayAppMenu(tr("Game"), - QPixmap(":/icons/22x22/applications-games.png")); + QPixmap(":/img/icons/22x22/applications-games.png")); appMenu[Application::GRAPHICS]=initTrayAppMenu(tr("Graphics"), - QPixmap(":/icons/22x22/applications-graphics.png")); + QPixmap(":/img/icons/22x22/applications-graphics.png")); appMenu[Application::NETWORK]=initTrayAppMenu(tr("Network"), - QPixmap(":/icons/22x22/applications-internet.png")); + QPixmap(":/img/icons/22x22/applications-internet.png")); appMenu[Application::OFFICE]=initTrayAppMenu(tr("Office"), - QPixmap(":/icons/22x22/applications-office.png")); + QPixmap(":/img/icons/22x22/applications-office.png")); appMenu[Application::SETTINGS]=initTrayAppMenu(tr("Settings"), - QPixmap(":/icons/22x22/preferences-system.png")); + QPixmap(":/img/icons/22x22/preferences-system.png")); appMenu[Application::SYSTEM]=initTrayAppMenu(tr("System"), - QPixmap(":/icons/22x22/applications-system.png")); + QPixmap(":/img/icons/22x22/applications-system.png")); appMenu[Application::UTILITY]=initTrayAppMenu(tr("Utility"), - QPixmap(":/icons/22x22/applications-utilities.png")); + QPixmap(":/img/icons/22x22/applications-utilities.png")); appMenu[Application::OTHER]=initTrayAppMenu(tr("Other"), - QPixmap(":/icons/22x22/applications-other.png")); + QPixmap(":/img/icons/22x22/applications-other.png")); appSeparator=trayIconActiveConnectionMenu->addSeparator(); @@ -1136,7 +1136,7 @@ void ONMainWindow::trayIconInit() connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(trayMessageClicked())); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") ); + trayIcon->setIcon(QIcon ( ":/img/icons/128x128/x2go.png") ); trayIcon->setToolTip(tr("Left mouse button to hide/restore - Right mouse button to display context menu")); } @@ -1229,7 +1229,7 @@ QString ONMainWindow::findTheme ( QString /*theme*/ ) QString ONMainWindow::getKdeIconsPath() { - return ":/icons"; + return ":/img/icons"; } void ONMainWindow::slotResize ( const QSize sz ) @@ -1584,7 +1584,7 @@ QString ONMainWindow::iconsPath ( QString fname ) /* QFile fl(this->kdeIconsPath+fname); if(fl.exists()) return kdeIconsPath+fname;*/ - return ( QString ) ":/icons"+fname; + return ( QString ) ":/img/icons"+fname; } void ONMainWindow::displayUsers() @@ -2539,7 +2539,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sessIcon=st->setting()->value ( sid+"/icon", - ( QVariant ) ":icons/128x128/x2gosession.png" + ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString(); sessIcon=expandHome(sessIcon); @@ -2591,7 +2591,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) server=config.server; userName=config.user; sshPort=config.sshport; - sessIcon=":icons/128x128/x2gosession.png"; + sessIcon=":/img/icons/128x128/x2gosession.png"; sessionName=config.session; currentKey=config.key; } @@ -4208,7 +4208,7 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) { sid="embedded"; if (!keepTrayIcon) { - QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString()); + QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":/img/icons/128x128/x2go.png")).toString()); trayIcon->setIcon(QIcon (imagePath)); } @@ -5479,7 +5479,7 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) #endif //set tray icon to default if (trayIcon && !keepTrayIcon) - trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") ); + trayIcon->setIcon(QIcon ( ":/img/icons/128x128/x2go.png") ); if ( embedMode ) @@ -10352,7 +10352,7 @@ void ONMainWindow::slotDetachProxyWindow() bgFrame->show(); setStatStatus(); act_embedContol->setText ( tr ( "Attach X2Go window" ) ); - act_embedContol->setIcon ( QIcon ( ":icons/32x32/attach.png" ) ); + act_embedContol->setIcon ( QIcon ( ":/img/icons/32x32/attach.png" ) ); #ifdef Q_OS_LINUX //if QX11EmbedContainer cannot embed window, check if window exists //and reconnect @@ -10378,7 +10378,7 @@ void ONMainWindow::slotAttachProxyWindow() setStatStatus(); act_embedContol->setText ( tr ( "Detach X2Go window" ) ); act_embedContol->setIcon ( - QIcon ( ":icons/32x32/detach.png" ) ); + QIcon ( ":/img/icons/32x32/detach.png" ) ); QTimer::singleShot ( 100, this, SLOT ( slotEmbedWindow() ) ); } else @@ -10953,25 +10953,25 @@ void ONMainWindow::initStatusDlg() sbApps=new QToolButton (sessionStatusDlg ); sbApps->setToolTip(tr ( "Applications..." )); - sbApps->setIcon(QPixmap(":/icons/32x32/apps.png")); + sbApps->setIcon(QPixmap(":/img/icons/32x32/apps.png")); sbApps->setAutoRaise(true); sbApps->setFocusPolicy(Qt::NoFocus); sbExp=new QToolButton (sessionStatusDlg ); - sbExp->setIcon(QPixmap(":/icons/32x32/open_dir.png")); + sbExp->setIcon(QPixmap(":/img/icons/32x32/open_dir.png")); sbExp->setToolTip (tr ("Share folder..." )); sbExp->setAutoRaise(true); sbExp->setFocusPolicy(Qt::NoFocus); sbSusp=new QToolButton (sessionStatusDlg ); - sbSusp->setIcon(QPixmap(":/icons/32x32/suspend_session.png")); + sbSusp->setIcon(QPixmap(":/img/icons/32x32/suspend_session.png")); sbSusp->setToolTip(tr ( "Abort" )); sbSusp->setAutoRaise(true); sbSusp->setFocusPolicy(Qt::NoFocus); sbTerm=new QToolButton (sessionStatusDlg ); - sbTerm->setIcon(QPixmap(":/icons/32x32/stop_session.png")); + sbTerm->setIcon(QPixmap(":/img/icons/32x32/stop_session.png")); sbTerm->setToolTip(tr ( "Terminate" )); sbTerm->setAutoRaise(true); sbTerm->setFocusPolicy(Qt::NoFocus); @@ -11470,7 +11470,7 @@ void ONMainWindow::slotEmbedToolBar() { stb->clear(); act_embedToolBar->setIcon ( - QIcon ( ":icons/16x16/tbshow.png" ) ); + QIcon ( ":/img/icons/16x16/tbshow.png" ) ); stb->addAction ( act_embedToolBar ); stb->setToolButtonStyle ( Qt::ToolButtonIconOnly ); stb->widgetForAction ( @@ -11486,7 +11486,7 @@ void ONMainWindow::slotEmbedToolBar() { initEmbedToolBar(); act_embedToolBar->setIcon ( - QIcon ( ":icons/32x32/tbhide.png" ) ); + QIcon ( ":/img/icons/32x32/tbhide.png" ) ); act_embedToolBar->setText ( tr ( "Minimize toolbar" ) ); } embedTbVisible=!embedTbVisible; diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 693b782..f20e579 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -313,12 +313,12 @@ void SessionButton::redraw() QString sessIcon=st->setting()->value ( sid+"/icon", ( QVariant ) - ":icons/128x128/x2gosession.png" + ":/img/icons/128x128/x2gosession.png" ).toString(); sessIcon = expandHome(sessIcon); QPixmap* pix; - if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png") + if (!par->brokerMode || sessIcon == ":/img/icons/128x128/x2gosession.png") pix=new QPixmap( sessIcon ); else { diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp index 3e1f688..fcdd719 100644 --- a/src/sessionexplorer.cpp +++ b/src/sessionexplorer.cpp @@ -170,10 +170,10 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt ) QString sessIcon=st.setting()->value ( bt->id() +"/icon", ( QVariant ) - ":icons/128x128/x2gosession.png" + ":/img/icons/128x128/x2gosession.png" ).toString(); sessIcon = expandHome(sessIcon); - if ( sessIcon.startsWith ( ":icons",Qt::CaseInsensitive ) || + if ( sessIcon.startsWith ( ":/img/icons",Qt::CaseInsensitive ) || !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) ) { sessIcon="/usr/share/x2goclient/icons/x2gosession.png"; diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp index 0efa73c..49016bf 100644 --- a/src/sessionmanagedialog.cpp +++ b/src/sessionmanagedialog.cpp @@ -148,7 +148,7 @@ void SessionManageDialog::loadSessions() root=new QTreeWidgetItem(sessions); root->setText(0,"/"); - root->setIcon(0,QIcon(":icons/128x128/folder.png")); + root->setIcon(0,QIcon(":/img/icons/128x128/folder.png")); initFolders(root, ""); root->setExpanded(true); root->setData(0, SESSIONROLE , false); diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index 708b25c..e49b718 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -547,7 +547,7 @@ void SessionWidget::readConfig() sessIcon=st.setting()->value ( sessionId+"/icon", - ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed(); + ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString().trimmed(); sessIcon=expandHome(sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); @@ -777,7 +777,7 @@ void SessionWidget::setDefaults() cmdCombo->lineEdit()->selectAll(); slot_changeCmd ( 0 ); cmd->setEnabled ( false ); - sessIcon=":icons/128x128/x2gosession.png"; + sessIcon=":/img/icons/128x128/x2gosession.png"; icon->setIcon ( QIcon ( sessIcon ) ); sshPort->setValue ( mainWindow->getDefaultSshPort().toInt() ); diff --git a/src/ui/helpdialog.ui b/src/ui/helpdialog.ui index 0a32254..fae9098 100644 --- a/src/ui/helpdialog.ui +++ b/src/ui/helpdialog.ui @@ -15,7 +15,7 @@ </property> <property name="windowIcon"> <iconset resource="resources.rcc"> - <normaloff>:/icons/32x32/x2goclient.png</normaloff>:/icons/32x32/x2goclient.png</iconset> + <normaloff>:/img/icons/32x32/x2goclient.png</normaloff>:/img/icons/32x32/x2goclient.png</iconset> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp index a3c5132..3ea0c52 100644 --- a/src/xsettingswidget.cpp +++ b/src/xsettingswidget.cpp @@ -37,7 +37,7 @@ XSettingsWidget::XSettingsWidget(QWidget* parent) leFSMod->setText(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString()); leSingApp->setText(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString()); // spDelay->setValue(st.setting()->value("delay",3).toInt()); - pbExec->setIcon( QPixmap ( ":/icons/16x16/file-open.png" ) ); + pbExec->setIcon( QPixmap ( ":/img/icons/16x16/file-open.png" ) ); } XSettingsWidget::~XSettingsWidget() diff --git a/x2goclient.pro b/x2goclient.pro index 23579d2..f96fac9 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -193,7 +193,7 @@ win32-* { CONFIG += static release } QT += svg network -ICON = icons/x2go-mac.icns +ICON = img/icons/x2go-mac.icns QMAKE_INFO_PLIST = Info.plist plugin { diff --git a/x2goclient.rc b/x2goclient.rc index d9fd10f..f2f6729 100644 --- a/x2goclient.rc +++ b/x2goclient.rc @@ -1,2 +1,2 @@ -IDI_ICON1 ICON DISCARDABLE "icons/x2go-win-48.ico" +IDI_ICON1 ICON DISCARDABLE "img/icons/x2go-win-48.ico" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 50d2292ca6c06791a5239cbf421a2a9e9dbf294f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 23:20:29 2015 +0100 general: Move *.rc and *.rcc files back to top directory for now. Resources must be in the resource file's base directory or a sub-directory. --- src/res/changelog.rcc => changelog.rcc | 0 debian/changelog | 2 ++ src/res/git.rcc => git.rcc | 0 src/res/resources.rcc => resources.rcc | 0 x2goclient.pro | 8 ++++---- src/res/x2goclient.rc => x2goclient.rc | 0 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/res/changelog.rcc b/changelog.rcc similarity index 100% rename from src/res/changelog.rcc rename to changelog.rcc diff --git a/debian/changelog b/debian/changelog index c0d7cfd..9a0ad6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Update .gitignore with more temporary files. - Make x2goclient.pro consistent: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable. + - Move *.rc and *.rcc files back to top directory for now. Resources must + be in the resource file's base directory or a sub-directory. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/res/git.rcc b/git.rcc similarity index 100% rename from src/res/git.rcc rename to git.rcc diff --git a/src/res/resources.rcc b/resources.rcc similarity index 100% rename from src/res/resources.rcc rename to resources.rcc diff --git a/x2goclient.pro b/x2goclient.pro index f30b1a5..23579d2 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -125,7 +125,7 @@ plugin { TARGET = x2goplugin } else { - RC_FILE = src/res/x2goclient.rc + RC_FILE = 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 += src/res/resources.rcc +RESOURCES += resources.rcc exists(txt/git-info) { message("Configuring with --git-info") - RESOURCES += src/res/git.rcc + RESOURCES += git.rcc } exists(txt/changelog) { message("Configuring with --changelog") - RESOURCES += src/res/changelog.rcc + RESOURCES += changelog.rcc } linux-g++ { diff --git a/src/res/x2goclient.rc b/x2goclient.rc similarity index 100% rename from src/res/x2goclient.rc rename to x2goclient.rc -- Alioth's /srv/git/code.x2go.org/x2goclient.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 2f18f052db9afaf9767fc153448ca529c78afc75 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:21:38 2015 +0100 Move svg/ to img/svg/ and update references in: - resources.rcc - src/folderbutton.cpp - src/onmainwindow.cpp - src/sessionbutton.cpp --- debian/changelog | 2 ++ {svg => img/svg}/bg-anim.svg | 0 {svg => img/svg}/bg.svg | 0 {svg => img/svg}/bg_hildon.svg | 0 {svg => img/svg}/folder.svg | 0 {svg => img/svg}/folder_grey.svg | 0 {svg => img/svg}/line.svg | 0 {svg => img/svg}/macinstaller_background.svg | 0 {svg => img/svg}/onlogo.svg | 0 {svg => img/svg}/passform.svg | 0 {svg => img/svg}/sessionbut.svg | 0 {svg => img/svg}/sessionbut_grey.svg | 0 {svg => img/svg}/unity.svg | 0 {svg => img/svg}/x2gologo.svg | 0 {svg => img/svg}/xfce.svg | 0 resources.rcc | 20 ++++++++++---------- src/folderbutton.cpp | 6 +++--- src/onmainwindow.cpp | 16 ++++++++-------- src/sessionbutton.cpp | 6 +++--- 19 files changed, 26 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index f918661..440480d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -152,6 +152,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium src/sessionwidget.cpp, src/ui/helpdialog.ui and src/xsettingswidget.cpp. - Move png/ to img/png/ and update references in resources.rcc and src/onmainwindow.cpp. + - Move svg/ to img/svg/ and update references in resources.rcc, + src/folderbutton.cpp, src/onmainwindow.cpp and src/sessionbutton.cpp. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/svg/bg-anim.svg b/img/svg/bg-anim.svg similarity index 100% rename from svg/bg-anim.svg rename to img/svg/bg-anim.svg diff --git a/svg/bg.svg b/img/svg/bg.svg similarity index 100% rename from svg/bg.svg rename to img/svg/bg.svg diff --git a/svg/bg_hildon.svg b/img/svg/bg_hildon.svg similarity index 100% rename from svg/bg_hildon.svg rename to img/svg/bg_hildon.svg diff --git a/svg/folder.svg b/img/svg/folder.svg similarity index 100% rename from svg/folder.svg rename to img/svg/folder.svg diff --git a/svg/folder_grey.svg b/img/svg/folder_grey.svg similarity index 100% rename from svg/folder_grey.svg rename to img/svg/folder_grey.svg diff --git a/svg/line.svg b/img/svg/line.svg similarity index 100% rename from svg/line.svg rename to img/svg/line.svg diff --git a/svg/macinstaller_background.svg b/img/svg/macinstaller_background.svg similarity index 100% rename from svg/macinstaller_background.svg rename to img/svg/macinstaller_background.svg diff --git a/svg/onlogo.svg b/img/svg/onlogo.svg similarity index 100% rename from svg/onlogo.svg rename to img/svg/onlogo.svg diff --git a/svg/passform.svg b/img/svg/passform.svg similarity index 100% rename from svg/passform.svg rename to img/svg/passform.svg diff --git a/svg/sessionbut.svg b/img/svg/sessionbut.svg similarity index 100% rename from svg/sessionbut.svg rename to img/svg/sessionbut.svg diff --git a/svg/sessionbut_grey.svg b/img/svg/sessionbut_grey.svg similarity index 100% rename from svg/sessionbut_grey.svg rename to img/svg/sessionbut_grey.svg diff --git a/svg/unity.svg b/img/svg/unity.svg similarity index 100% rename from svg/unity.svg rename to img/svg/unity.svg diff --git a/svg/x2gologo.svg b/img/svg/x2gologo.svg similarity index 100% rename from svg/x2gologo.svg rename to img/svg/x2gologo.svg diff --git a/svg/xfce.svg b/img/svg/xfce.svg similarity index 100% rename from svg/xfce.svg rename to img/svg/xfce.svg diff --git a/resources.rcc b/resources.rcc index 04a5a53..35f43a8 100644 --- a/resources.rcc +++ b/resources.rcc @@ -1,15 +1,15 @@ <RCC> <qresource> - <file>svg/bg.svg</file> - <file>svg/bg_hildon.svg</file> - <file>svg/line.svg</file> - <file>svg/onlogo.svg</file> - <file>svg/x2gologo.svg</file> - <file>svg/passform.svg</file> - <file>svg/sessionbut.svg</file> - <file>svg/folder.svg</file> - <file>svg/folder_grey.svg</file> - <file>svg/sessionbut_grey.svg</file> + <file>img/svg/bg.svg</file> + <file>img/svg/bg_hildon.svg</file> + <file>img/svg/line.svg</file> + <file>img/svg/onlogo.svg</file> + <file>img/svg/x2gologo.svg</file> + <file>img/svg/passform.svg</file> + <file>img/svg/sessionbut.svg</file> + <file>img/svg/folder.svg</file> + <file>img/svg/folder_grey.svg</file> + <file>img/svg/sessionbut_grey.svg</file> <file>img/png/ico.png</file> <file>img/png/ico_mini.png</file> <file>img/png/sess_ico.png</file> diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp index c6b571a..6894e31 100644 --- a/src/folderbutton.cpp +++ b/src/folderbutton.cpp @@ -35,7 +35,7 @@ FolderButton::FolderButton ( ONMainWindow* mw,QWidget *parent, QString folderPath, QString folderName ) - : SVGFrame ( ":/svg/folder.svg",false,parent ) + : SVGFrame ( ":/img/svg/folder.svg",false,parent ) { QPalette pal=palette(); pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); @@ -153,7 +153,7 @@ bool FolderButton::lessThen ( const FolderButton* b1, void FolderButton::mousePressEvent ( QMouseEvent * event ) { SVGFrame::mousePressEvent ( event ); - loadBg ( ":/svg/folder_grey.svg" ); + loadBg ( ":/img/svg/folder_grey.svg" ); } void FolderButton::mouseReleaseEvent ( QMouseEvent * event ) @@ -161,7 +161,7 @@ void FolderButton::mouseReleaseEvent ( QMouseEvent * event ) SVGFrame::mouseReleaseEvent ( event ); int x=event->x(); int y=event->y(); - loadBg ( ":/svg/folder.svg" ); + loadBg ( ":/img/svg/folder.svg" ); if ( x>=0 && x< width() && y>=0 && y<height() ) emit clicked(); } diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 9ca1480..7e2018d 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -325,14 +325,14 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (BGFile.size()) bgFrame=new SVGFrame ( ( QString ) BGFile,true,fr ); else - bgFrame=new SVGFrame ( ( QString ) ":/svg/bg.svg",true,fr ); + bgFrame=new SVGFrame ( ( QString ) ":/img/svg/bg.svg",true,fr ); #else - bgFrame=new SVGFrame ( ( QString ) ":/svg/bg_hildon.svg",true,fr ); + bgFrame=new SVGFrame ( ( QString ) ":/img/svg/bg_hildon.svg",true,fr ); #endif //bgFrame=new SVGFrame((QString)"/home/admin/test.svg",false,fr); - SVGFrame* x2g=new SVGFrame ( ( QString ) ":/svg/x2gologo.svg", + SVGFrame* x2g=new SVGFrame ( ( QString ) ":/img/svg/x2gologo.svg", false,fr ); QPalette pl=x2g->palette(); @@ -340,7 +340,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) pl.setColor ( QPalette::Window, QColor ( 255,255,255,0 ) ); x2g->setPalette ( pl ); - SVGFrame* on=new SVGFrame ( ( QString ) ":/svg/onlogo.svg",false,fr ); + SVGFrame* on=new SVGFrame ( ( QString ) ":/img/svg/onlogo.svg",false,fr ); on->setPalette ( pl ); if ( !miniMode ) @@ -719,7 +719,7 @@ void ONMainWindow::initWidgetsNormal() username->setSpacing ( 10 ); username->addStretch(); username->addStretch(); - ln=new SVGFrame ( ( QString ) ":/svg/line.svg",true,fr ); + ln=new SVGFrame ( ( QString ) ":/img/svg/line.svg",true,fr ); ln->setFixedWidth ( ln->sizeHint().width() ); uname=new QLineEdit ( bgFrame ); setWidgetStyle ( uname ); @@ -10718,7 +10718,7 @@ void ONMainWindow::slotChangeKbdLayout(const QString& layout) void ONMainWindow::initPassDlg() { - passForm = new SVGFrame ( ":/svg/passform.svg", + passForm = new SVGFrame ( ":/img/svg/passform.svg", false,bgFrame ); #ifdef Q_OS_WIN passForm->setMainWidget ( ( QWidget* ) this ); @@ -10910,7 +10910,7 @@ void ONMainWindow::initPassDlg() void ONMainWindow::initStatusDlg() { - sessionStatusDlg = new SVGFrame ( ":/svg/passform.svg", + sessionStatusDlg = new SVGFrame ( ":/img/svg/passform.svg", false,bgFrame ); sessionStatusDlg->hide(); if ( !miniMode ) @@ -11094,7 +11094,7 @@ void ONMainWindow::initStatusDlg() void ONMainWindow::initSelectSessDlg() { - selectSessionDlg = new SVGFrame ( ":/svg/passform.svg", + selectSessionDlg = new SVGFrame ( ":/img/svg/passform.svg", false,bgFrame ); username->addWidget ( selectSessionDlg ); setWidgetStyle ( selectSessionDlg ); diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index f20e579..8967d77 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -37,7 +37,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) - : SVGFrame ( ":/svg/sessionbut.svg",false,parent ) + : SVGFrame ( ":/img/svg/sessionbut.svg",false,parent ) { editable=mw->sessionEditEnabled(); @@ -564,7 +564,7 @@ void SessionButton::redraw() void SessionButton::mousePressEvent ( QMouseEvent * event ) { SVGFrame::mousePressEvent ( event ); - loadBg ( ":/svg/sessionbut_grey.svg" ); + loadBg ( ":/img/svg/sessionbut_grey.svg" ); } void SessionButton::mouseReleaseEvent ( QMouseEvent * event ) @@ -572,7 +572,7 @@ void SessionButton::mouseReleaseEvent ( QMouseEvent * event ) SVGFrame::mouseReleaseEvent ( event ); int x=event->x(); int y=event->y(); - loadBg ( ":/svg/sessionbut.svg" ); + loadBg ( ":/img/svg/sessionbut.svg" ); if ( x>=0 && x< width() && y>=0 && y<height() ) emit clicked(); } -- Alioth's /srv/git/code.x2go.org/x2goclient.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 311cff355cdec6c814a225a03cba54d5d618f414 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:32:13 2015 +0100 general: move *.ts and *.qm files to i18n/ and update references in: - resources.rcc - x2goclient.pro - debian/rules --- debian/changelog | 2 ++ debian/rules | 2 +- qt_da.qm => i18n/qt_da.qm | Bin 119218 -> 119218 bytes qt_de.qm => i18n/qt_de.qm | Bin 328778 -> 328778 bytes qt_es.qm => i18n/qt_es.qm | Bin 87895 -> 87895 bytes qt_fr.qm => i18n/qt_fr.qm | Bin 260053 -> 260053 bytes qt_pt.qm => i18n/qt_pt.qm | Bin 75638 -> 75638 bytes qt_ru.qm => i18n/qt_ru.qm | Bin 288412 -> 288412 bytes qt_sv.qm => i18n/qt_sv.qm | Bin 71500 -> 71500 bytes qt_zh_tw.qm => i18n/qt_zh_tw.qm | Bin 119489 -> 119489 bytes x2goclient_da.ts => i18n/x2goclient_da.ts | 0 x2goclient_de.ts => i18n/x2goclient_de.ts | 0 x2goclient_es.ts => i18n/x2goclient_es.ts | 0 x2goclient_et.ts => i18n/x2goclient_et.ts | 0 x2goclient_fi.ts => i18n/x2goclient_fi.ts | 0 x2goclient_fr.ts => i18n/x2goclient_fr.ts | 0 x2goclient_nb_no.ts => i18n/x2goclient_nb_no.ts | 0 x2goclient_nl.ts => i18n/x2goclient_nl.ts | 0 x2goclient_pt.ts => i18n/x2goclient_pt.ts | 0 x2goclient_ru.ts => i18n/x2goclient_ru.ts | 0 x2goclient_sv.ts => i18n/x2goclient_sv.ts | 0 x2goclient_tr.ts => i18n/x2goclient_tr.ts | 0 x2goclient_zh_tw.ts => i18n/x2goclient_zh_tw.ts | 0 resources.rcc | 40 +++++++++++------------ x2goclient.pro | 26 +++++++-------- 25 files changed, 36 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa856b1..4963fe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -155,6 +155,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Move svg/ to img/svg/ and update references in resources.rcc, src/folderbutton.cpp, src/onmainwindow.cpp and src/sessionbutton.cpp. - Move *.ts files back to the top directory (they are resources.) + - Move *.ts and *.qm files to i18n/ and update references in + resources.rcc, x2goclient.pro and debian/rules. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/rules b/debian/rules index c4e788e..ad45228 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_auto_configure: override_dh_auto_clean: dh_auto_clean # clean stray .qm files that are not handled by clean rule in upstream Makefile - rm -Rf x2goclient_*.qm + rm -Rf i18n/x2goclient_*.qm rm -f txt/changelog override_dh_strip: diff --git a/qt_da.qm b/i18n/qt_da.qm similarity index 100% rename from qt_da.qm rename to i18n/qt_da.qm diff --git a/qt_de.qm b/i18n/qt_de.qm similarity index 100% rename from qt_de.qm rename to i18n/qt_de.qm diff --git a/qt_es.qm b/i18n/qt_es.qm similarity index 100% rename from qt_es.qm rename to i18n/qt_es.qm diff --git a/qt_fr.qm b/i18n/qt_fr.qm similarity index 100% rename from qt_fr.qm rename to i18n/qt_fr.qm diff --git a/qt_pt.qm b/i18n/qt_pt.qm similarity index 100% rename from qt_pt.qm rename to i18n/qt_pt.qm diff --git a/qt_ru.qm b/i18n/qt_ru.qm similarity index 100% rename from qt_ru.qm rename to i18n/qt_ru.qm diff --git a/qt_sv.qm b/i18n/qt_sv.qm similarity index 100% rename from qt_sv.qm rename to i18n/qt_sv.qm diff --git a/qt_zh_tw.qm b/i18n/qt_zh_tw.qm similarity index 100% rename from qt_zh_tw.qm rename to i18n/qt_zh_tw.qm diff --git a/x2goclient_da.ts b/i18n/x2goclient_da.ts similarity index 100% rename from x2goclient_da.ts rename to i18n/x2goclient_da.ts diff --git a/x2goclient_de.ts b/i18n/x2goclient_de.ts similarity index 100% rename from x2goclient_de.ts rename to i18n/x2goclient_de.ts diff --git a/x2goclient_es.ts b/i18n/x2goclient_es.ts similarity index 100% rename from x2goclient_es.ts rename to i18n/x2goclient_es.ts diff --git a/x2goclient_et.ts b/i18n/x2goclient_et.ts similarity index 100% rename from x2goclient_et.ts rename to i18n/x2goclient_et.ts diff --git a/x2goclient_fi.ts b/i18n/x2goclient_fi.ts similarity index 100% rename from x2goclient_fi.ts rename to i18n/x2goclient_fi.ts diff --git a/x2goclient_fr.ts b/i18n/x2goclient_fr.ts similarity index 100% rename from x2goclient_fr.ts rename to i18n/x2goclient_fr.ts diff --git a/x2goclient_nb_no.ts b/i18n/x2goclient_nb_no.ts similarity index 100% rename from x2goclient_nb_no.ts rename to i18n/x2goclient_nb_no.ts diff --git a/x2goclient_nl.ts b/i18n/x2goclient_nl.ts similarity index 100% rename from x2goclient_nl.ts rename to i18n/x2goclient_nl.ts diff --git a/x2goclient_pt.ts b/i18n/x2goclient_pt.ts similarity index 100% rename from x2goclient_pt.ts rename to i18n/x2goclient_pt.ts diff --git a/x2goclient_ru.ts b/i18n/x2goclient_ru.ts similarity index 100% rename from x2goclient_ru.ts rename to i18n/x2goclient_ru.ts diff --git a/x2goclient_sv.ts b/i18n/x2goclient_sv.ts similarity index 100% rename from x2goclient_sv.ts rename to i18n/x2goclient_sv.ts diff --git a/x2goclient_tr.ts b/i18n/x2goclient_tr.ts similarity index 100% rename from x2goclient_tr.ts rename to i18n/x2goclient_tr.ts diff --git a/x2goclient_zh_tw.ts b/i18n/x2goclient_zh_tw.ts similarity index 100% rename from x2goclient_zh_tw.ts rename to i18n/x2goclient_zh_tw.ts diff --git a/resources.rcc b/resources.rcc index 35f43a8..95b7182 100644 --- a/resources.rcc +++ b/resources.rcc @@ -88,25 +88,25 @@ <file>img/icons/22x22/preferences-system.png</file> <file>txt/packs</file> <file>txt/encodings</file> - <file>x2goclient_da.qm</file> - <file>x2goclient_de.qm</file> - <file>x2goclient_es.qm</file> - <file>x2goclient_et.qm</file> - <file>x2goclient_fi.qm</file> - <file>x2goclient_fr.qm</file> - <file>x2goclient_nb_no.qm</file> - <file>x2goclient_nl.qm</file> - <file>x2goclient_pt.qm</file> - <file>x2goclient_ru.qm</file> - <file>x2goclient_sv.qm</file> - <file>x2goclient_zh_tw.qm</file> - <file>qt_da.qm</file> - <file>qt_de.qm</file> - <file>qt_es.qm</file> - <file>qt_fr.qm</file> - <file>qt_pt.qm</file> - <file>qt_ru.qm</file> - <file>qt_sv.qm</file> - <file>qt_zh_tw.qm</file> + <file>i18n/x2goclient_da.qm</file> + <file>i18n/x2goclient_de.qm</file> + <file>i18n/x2goclient_es.qm</file> + <file>i18n/x2goclient_et.qm</file> + <file>i18n/x2goclient_fi.qm</file> + <file>i18n/x2goclient_fr.qm</file> + <file>i18n/x2goclient_nb_no.qm</file> + <file>i18n/x2goclient_nl.qm</file> + <file>i18n/x2goclient_pt.qm</file> + <file>i18n/x2goclient_ru.qm</file> + <file>i18n/x2goclient_sv.qm</file> + <file>i18n/x2goclient_zh_tw.qm</file> + <file>i18n/qt_da.qm</file> + <file>i18n/qt_de.qm</file> + <file>i18n/qt_es.qm</file> + <file>i18n/qt_fr.qm</file> + <file>i18n/qt_pt.qm</file> + <file>i18n/qt_ru.qm</file> + <file>i18n/qt_sv.qm</file> + <file>i18n/qt_zh_tw.qm</file> </qresource> </RCC> diff --git a/x2goclient.pro b/x2goclient.pro index f96fac9..c9e53c6 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -20,19 +20,19 @@ FORMS += src/ui/cupsprintsettingsdialog.ui \ src/ui/helpdialog.ui \ src/ui/folderexplorer.ui -TRANSLATIONS += src/i18n/x2goclient_de.ts \ - src/i18n/x2goclient_da.ts \ - src/i18n/x2goclient_es.ts \ - src/i18n/x2goclient_et.ts \ - src/i18n/x2goclient_fi.ts \ - src/i18n/x2goclient_fr.ts \ - src/i18n/x2goclient_nb_no.ts \ - src/i18n/x2goclient_nl.ts \ - src/i18n/x2goclient_pt.ts \ - src/i18n/x2goclient_ru.ts \ - src/i18n/x2goclient_sv.ts \ - src/i18n/x2goclient_tr.ts \ - src/i18n/x2goclient_zh_tw.ts +TRANSLATIONS += i18n/x2goclient_de.ts \ + i18n/x2goclient_da.ts \ + i18n/x2goclient_es.ts \ + i18n/x2goclient_et.ts \ + i18n/x2goclient_fi.ts \ + i18n/x2goclient_fr.ts \ + i18n/x2goclient_nb_no.ts \ + i18n/x2goclient_nl.ts \ + i18n/x2goclient_pt.ts \ + i18n/x2goclient_ru.ts \ + i18n/x2goclient_sv.ts \ + i18n/x2goclient_tr.ts \ + i18n/x2goclient_zh_tw.ts HEADERS += src/configdialog.h \ src/editconnectiondialog.h \ -- Alioth's /srv/git/code.x2go.org/x2goclient.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 a88a8e840737aa08ec46b187c6ad7045b2d8c89d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:46:16 2015 +0100 nsis/x2goclient.nsi: don't change the icons path. --- debian/changelog | 1 + nsis/x2goclient.nsi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c34163..c88fca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -159,6 +159,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium resources.rcc, x2goclient.pro and debian/rules. - Fix formatting errors in nsis/gpl.txt. - Fix whitespace errors in nsis/x2goclient.nsi. + - Don't change the icons path in nsis/x2goclient.nsi. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 1b49e4d..a0cafc5 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -15,8 +15,8 @@ Name "x2goclient ${VERSION}" Caption "x2goclient ${VERSION}" OutFile "x2goclient-${VERSION}-setup.exe" - !define MUI_ICON img\icons\win-install.ico - !define MUI_UNICON img\icons\win-uninstall.ico + !define MUI_ICON icons\win-install.ico + !define MUI_UNICON icons\win-uninstall.ico ;Default installation folder InstallDir "$PROGRAMFILES\x2goclient" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 a08186f4dcf5de45cd7dc4bf1eee9c19ce6ac293 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:37:00 2015 +0100 nsis/gpl.txt: fix formatting errors. --- debian/changelog | 1 + nsis/gpl.txt | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4963fe5..d88bf48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Move *.ts files back to the top directory (they are resources.) - Move *.ts and *.qm files to i18n/ and update references in resources.rcc, x2goclient.pro and debian/rules. + - Fix formatting errors in nsis/gpl.txt. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/nsis/gpl.txt b/nsis/gpl.txt index 7a8e8ab..3d1e3ee 100755 --- a/nsis/gpl.txt +++ b/nsis/gpl.txt @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it -- Alioth's /srv/git/code.x2go.org/x2goclient.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 7915e498b67aaf15b998dec5cf7572b8315b81dc Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:54:26 2015 +0100 x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc: fix whitespace errors. --- debian/changelog | 1 + x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8410191..d1561b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -163,6 +163,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Make nsis files non-executable. - Move x2go-logos/ to img/x2go-logos and update references in COPYRIGHT.x2go-logos. + - Fix whitespace errors in x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc index 9c22d50..1a3b308 100644 --- a/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc +++ b/x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "Obviously Nice\0" VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" - VALUE "FileExtents", "x2go\0" - VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" + VALUE "FileExtents", "x2go\0" + VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" VALUE "FileVersion", "4, 0, 4 ,0\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2015 X2Go Project\0" - VALUE "MIMEType", "application/x2go\0" + VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" VALUE "ProductName", "X2GoClient Plug-in 4.0.4.0\0" VALUE "ProductVersion", "4, 0, 3, 2\0" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 12e7d7656a8b7946d1a13b3d906a5217791ceb83 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:52:34 2015 +0100 general: move x2go-logos/ to img/x2go-logos and update references in: - COPYRIGHT.x2go-logos --- COPYRIGHT.x2go-logos | 10 +++++----- debian/changelog | 2 ++ {x2go-logos => img/x2go-logos}/mksizedsymbols.sh | 0 .../x2go-logos}/x2go-logo-colored.svg | 0 .../x2go-logos}/x2go-logo-rotated.svg | 0 {x2go-logos => img/x2go-logos}/x2go-logo.svg | 0 {x2go-logos => img/x2go-logos}/x2go-mascot.svg | 0 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/COPYRIGHT.x2go-logos b/COPYRIGHT.x2go-logos index 2b21e9f..3bf4c7b 100644 --- a/COPYRIGHT.x2go-logos +++ b/COPYRIGHT.x2go-logos @@ -2,14 +2,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X2Go-artwork [~X] Upstream-Contact: Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -Files: x2go-logos/mksizedsymbols.sh +Files: img/x2go-logos/mksizedsymbols.sh Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ - x2go-logos/x2go-logo-colored.svg - x2go-logos/x2go-logo.svg - x2go-logos/x2go-logo-rotated.svg - x2go-logos/x2go-mascot.svg + img/x2go-logos/x2go-logo-colored.svg + img/x2go-logos/x2go-logo.svg + img/x2go-logos/x2go-logo-rotated.svg + img/x2go-logos/x2go-mascot.svg Copyright: 2005-2015 Heinz-M. Grasesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ diff --git a/debian/changelog b/debian/changelog index c672cb1..8410191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -161,6 +161,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Fix whitespace errors in nsis/x2goclient.nsi. - Don't change the icons path in nsis/x2goclient.nsi. - Make nsis files non-executable. + - Move x2go-logos/ to img/x2go-logos and update references in + COPYRIGHT.x2go-logos. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2go-logos/mksizedsymbols.sh b/img/x2go-logos/mksizedsymbols.sh similarity index 100% rename from x2go-logos/mksizedsymbols.sh rename to img/x2go-logos/mksizedsymbols.sh diff --git a/x2go-logos/x2go-logo-colored.svg b/img/x2go-logos/x2go-logo-colored.svg similarity index 100% rename from x2go-logos/x2go-logo-colored.svg rename to img/x2go-logos/x2go-logo-colored.svg diff --git a/x2go-logos/x2go-logo-rotated.svg b/img/x2go-logos/x2go-logo-rotated.svg similarity index 100% rename from x2go-logos/x2go-logo-rotated.svg rename to img/x2go-logos/x2go-logo-rotated.svg diff --git a/x2go-logos/x2go-logo.svg b/img/x2go-logos/x2go-logo.svg similarity index 100% rename from x2go-logos/x2go-logo.svg rename to img/x2go-logos/x2go-logo.svg diff --git a/x2go-logos/x2go-mascot.svg b/img/x2go-logos/x2go-mascot.svg similarity index 100% rename from x2go-logos/x2go-mascot.svg rename to img/x2go-logos/x2go-mascot.svg -- Alioth's /srv/git/code.x2go.org/x2goclient.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 7d4b197cafe1c6faf8f5e725d795cf6f125e54bf Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 01:30:16 2015 +0100 general: move img/ to res/img/ and update references in: - COPYRIGHT.x2go-logos - Makefile - debian/x2goclient.install - macbuild.sh - x2goclient.pro - x2goclient.rc --- COPYRIGHT.x2go-logos | 20 ++++++------- Makefile | 14 ++++----- debian/changelog | 30 ++++++++++++++++---- debian/x2goclient.install | 14 ++++----- macbuild.sh | 4 +-- {img => res/img}/icons/128x128/X.png | Bin 6255 -> 6255 bytes {img => res/img}/icons/128x128/audio.png | Bin 5229 -> 5229 bytes {img => res/img}/icons/128x128/create_file.png | Bin 5107 -> 5107 bytes {img => res/img}/icons/128x128/delete.png | Bin 7978 -> 7978 bytes {img => res/img}/icons/128x128/edit.png | Bin 5761 -> 5761 bytes {img => res/img}/icons/128x128/edit_file.png | Bin 6219 -> 6219 bytes {img => res/img}/icons/128x128/edit_settings.png | Bin 5806 -> 5806 bytes {img => res/img}/icons/128x128/file-open.png | Bin 4051 -> 4051 bytes {img => res/img}/icons/128x128/folder.png | Bin 3220 -> 3220 bytes {img => res/img}/icons/128x128/gnome.png | Bin 3650 -> 3650 bytes {img => res/img}/icons/128x128/kde.png | Bin 14296 -> 14296 bytes {img => res/img}/icons/128x128/lxde.png | Bin 11886 -> 11886 bytes {img => res/img}/icons/128x128/new_file.png | Bin 4882 -> 4882 bytes {img => res/img}/icons/128x128/preferences.png | Bin 18292 -> 18292 bytes {img => res/img}/icons/128x128/rdp.png | Bin 10941 -> 10941 bytes {img => res/img}/icons/128x128/resolution.png | Bin 3308 -> 3308 bytes {img => res/img}/icons/128x128/session.png | Bin 4936 -> 4936 bytes {img => res/img}/icons/128x128/unity.png | Bin 17622 -> 17622 bytes {img => res/img}/icons/128x128/x2go.png | Bin 6085 -> 6085 bytes {img => res/img}/icons/128x128/x2goclient.png | Bin 19158 -> 19158 bytes {img => res/img}/icons/128x128/x2gogroup.png | Bin 1817 -> 1817 bytes {img => res/img}/icons/128x128/x2gohosts.png | Bin 1731 -> 1731 bytes {img => res/img}/icons/128x128/x2gomailclient.png | Bin 19158 -> 19158 bytes {img => res/img}/icons/128x128/x2gosession.png | Bin 9324 -> 9324 bytes {img => res/img}/icons/128x128/x2gouser.png | Bin 1771 -> 1771 bytes {img => res/img}/icons/16x16/X.png | Bin 657 -> 657 bytes {img => res/img}/icons/16x16/audio.png | Bin 653 -> 653 bytes {img => res/img}/icons/16x16/cinnamon.png | Bin 505 -> 505 bytes {img => res/img}/icons/16x16/create_file.png | Bin 594 -> 594 bytes {img => res/img}/icons/16x16/delete.png | Bin 680 -> 680 bytes {img => res/img}/icons/16x16/edit.png | Bin 662 -> 662 bytes {img => res/img}/icons/16x16/edit_file.png | Bin 649 -> 649 bytes {img => res/img}/icons/16x16/edit_settings.png | Bin 646 -> 646 bytes {img => res/img}/icons/16x16/file-open.png | Bin 595 -> 595 bytes {img => res/img}/icons/16x16/gnome.png | Bin 463 -> 463 bytes {img => res/img}/icons/16x16/icewm.png | Bin 538 -> 538 bytes {img => res/img}/icons/16x16/kde.png | Bin 899 -> 899 bytes {img => res/img}/icons/16x16/lxde.png | Bin 716 -> 716 bytes {img => res/img}/icons/16x16/mate.png | Bin 774 -> 774 bytes {img => res/img}/icons/16x16/new_file.png | Bin 593 -> 593 bytes {img => res/img}/icons/16x16/openbox.png | Bin 360 -> 360 bytes {img => res/img}/icons/16x16/preferences.png | Bin 340 -> 340 bytes {img => res/img}/icons/16x16/rdp.png | Bin 754 -> 754 bytes {img => res/img}/icons/16x16/resolution.png | Bin 446 -> 446 bytes {img => res/img}/icons/16x16/session.png | Bin 846 -> 846 bytes {img => res/img}/icons/16x16/tbshow.png | Bin 302 -> 302 bytes {img => res/img}/icons/16x16/trinity.png | Bin 748 -> 748 bytes {img => res/img}/icons/16x16/unity.png | Bin 1410 -> 1410 bytes {img => res/img}/icons/16x16/x2go.png | Bin 854 -> 854 bytes {img => res/img}/icons/16x16/x2goclient.png | Bin 949 -> 949 bytes {img => res/img}/icons/16x16/xfce.png | Bin 639 -> 639 bytes .../img}/icons/22x22/applications-development.png | Bin 977 -> 977 bytes .../img}/icons/22x22/applications-education.png | Bin 644 -> 644 bytes .../img}/icons/22x22/applications-games.png | Bin 688 -> 688 bytes .../img}/icons/22x22/applications-graphics.png | Bin 1523 -> 1523 bytes .../img}/icons/22x22/applications-internet.png | Bin 1355 -> 1355 bytes .../img}/icons/22x22/applications-multimedia.png | Bin 1353 -> 1353 bytes .../img}/icons/22x22/applications-office.png | Bin 804 -> 804 bytes .../img}/icons/22x22/applications-other.png | Bin 775 -> 775 bytes .../img}/icons/22x22/applications-system.png | Bin 1403 -> 1403 bytes .../img}/icons/22x22/applications-utilities.png | Bin 888 -> 888 bytes .../img}/icons/22x22/preferences-system.png | Bin 1350 -> 1350 bytes {img => res/img}/icons/32x32/X.png | Bin 1414 -> 1414 bytes {img => res/img}/icons/32x32/apps.png | Bin 1664 -> 1664 bytes {img => res/img}/icons/32x32/attach.png | Bin 831 -> 831 bytes {img => res/img}/icons/32x32/audio.png | Bin 1465 -> 1465 bytes {img => res/img}/icons/32x32/auth.png | Bin 1686 -> 1686 bytes {img => res/img}/icons/32x32/contest.png | Bin 1267 -> 1267 bytes {img => res/img}/icons/32x32/create_file.png | Bin 1148 -> 1148 bytes {img => res/img}/icons/32x32/delete.png | Bin 1456 -> 1456 bytes {img => res/img}/icons/32x32/detach.png | Bin 870 -> 870 bytes {img => res/img}/icons/32x32/edit.png | Bin 1232 -> 1232 bytes {img => res/img}/icons/32x32/edit_file.png | Bin 1334 -> 1334 bytes {img => res/img}/icons/32x32/edit_settings.png | Bin 1313 -> 1313 bytes {img => res/img}/icons/32x32/exit.png | Bin 1915 -> 1915 bytes {img => res/img}/icons/32x32/file-open.png | Bin 1068 -> 1068 bytes {img => res/img}/icons/32x32/gnome.png | Bin 846 -> 846 bytes {img => res/img}/icons/32x32/kde.png | Bin 2245 -> 2245 bytes {img => res/img}/icons/32x32/lxde.png | Bin 1731 -> 1731 bytes {img => res/img}/icons/32x32/new_file.png | Bin 1109 -> 1109 bytes {img => res/img}/icons/32x32/open_dir.png | Bin 476 -> 476 bytes {img => res/img}/icons/32x32/preferences.png | Bin 2545 -> 2545 bytes {img => res/img}/icons/32x32/rdp.png | Bin 1768 -> 1768 bytes {img => res/img}/icons/32x32/reconnect.png | Bin 1651 -> 1651 bytes {img => res/img}/icons/32x32/resolution.png | Bin 855 -> 855 bytes {img => res/img}/icons/32x32/session.png | Bin 1177 -> 1177 bytes {img => res/img}/icons/32x32/stop.png | Bin 1190 -> 1190 bytes {img => res/img}/icons/32x32/stop_session.png | Bin 1093 -> 1093 bytes {img => res/img}/icons/32x32/suspend.png | Bin 349 -> 349 bytes {img => res/img}/icons/32x32/suspend_session.png | Bin 229 -> 229 bytes {img => res/img}/icons/32x32/tbhide.png | Bin 1266 -> 1266 bytes {img => res/img}/icons/32x32/tbshow.png | Bin 902 -> 902 bytes {img => res/img}/icons/32x32/tbshow.xcf | Bin 2124 -> 2124 bytes {img => res/img}/icons/32x32/unity.png | Bin 2984 -> 2984 bytes {img => res/img}/icons/32x32/x2goclient.png | Bin 2675 -> 2675 bytes {img => res/img}/icons/48x48/x2goclient.png | Bin 4817 -> 4817 bytes {img => res/img}/icons/64x64/X.png | Bin 3066 -> 3066 bytes {img => res/img}/icons/64x64/audio.png | Bin 2895 -> 2895 bytes {img => res/img}/icons/64x64/create_file.png | Bin 2595 -> 2595 bytes {img => res/img}/icons/64x64/delete.png | Bin 3752 -> 3752 bytes {img => res/img}/icons/64x64/edit.png | Bin 2785 -> 2785 bytes {img => res/img}/icons/64x64/edit_file.png | Bin 3057 -> 3057 bytes {img => res/img}/icons/64x64/edit_settings.png | Bin 2955 -> 2955 bytes {img => res/img}/icons/64x64/file-open.png | Bin 2039 -> 2039 bytes {img => res/img}/icons/64x64/gnome.png | Bin 1689 -> 1689 bytes {img => res/img}/icons/64x64/kde.png | Bin 5725 -> 5725 bytes {img => res/img}/icons/64x64/lxde.png | Bin 4537 -> 4537 bytes {img => res/img}/icons/64x64/new_file.png | Bin 2440 -> 2440 bytes {img => res/img}/icons/64x64/personal.png | Bin 5046 -> 5046 bytes {img => res/img}/icons/64x64/preferences.png | Bin 7000 -> 7000 bytes {img => res/img}/icons/64x64/rdp.png | Bin 4498 -> 4498 bytes {img => res/img}/icons/64x64/resolution.png | Bin 1805 -> 1805 bytes {img => res/img}/icons/64x64/session.png | Bin 2606 -> 2606 bytes {img => res/img}/icons/64x64/unity.png | Bin 7241 -> 7241 bytes {img => res/img}/icons/64x64/x2goclient.png | Bin 7095 -> 7095 bytes {img => res/img}/icons/hildon/x2goclient_26.png | Bin 1235 -> 1235 bytes {img => res/img}/icons/hildon/x2goclient_40.png | Bin 1860 -> 1860 bytes {img => res/img}/icons/hildon/x2goclient_64.png | Bin 2826 -> 2826 bytes .../img}/icons/hildon/x2goclient_hildon.svg | 0 {img => res/img}/icons/x2go-mac.icns | Bin 134586 -> 134586 bytes {img => res/img}/icons/x2go-win-48.ico | Bin 120254 -> 120254 bytes {img => res/img}/icons/x2goclient.xpm | 0 {img => res/img}/png/ico.png | Bin 3437 -> 3437 bytes {img => res/img}/png/ico_440x180.png | Bin 1331 -> 1331 bytes {img => res/img}/png/ico_mini.png | Bin 753 -> 753 bytes {img => res/img}/png/macinstaller_background.png | Bin 59943 -> 59943 bytes {img => res/img}/png/power-button.png | Bin 762 -> 762 bytes {img => res/img}/png/sess_ico.png | Bin 1161 -> 1161 bytes {img => res/img}/svg/bg-anim.svg | 0 {img => res/img}/svg/bg.svg | 0 {img => res/img}/svg/bg_hildon.svg | 0 {img => res/img}/svg/folder.svg | 0 {img => res/img}/svg/folder_grey.svg | 0 {img => res/img}/svg/line.svg | 0 {img => res/img}/svg/macinstaller_background.svg | 0 {img => res/img}/svg/onlogo.svg | 0 {img => res/img}/svg/passform.svg | 0 {img => res/img}/svg/sessionbut.svg | 0 {img => res/img}/svg/sessionbut_grey.svg | 0 {img => res/img}/svg/unity.svg | 0 {img => res/img}/svg/x2gologo.svg | 0 {img => res/img}/svg/xfce.svg | 0 {img => res/img}/x2go-logos/mksizedsymbols.sh | 0 {img => res/img}/x2go-logos/x2go-logo-colored.svg | 0 {img => res/img}/x2go-logos/x2go-logo-rotated.svg | 0 {img => res/img}/x2go-logos/x2go-logo.svg | 0 {img => res/img}/x2go-logos/x2go-mascot.svg | 0 x2goclient.pro | 2 +- x2goclient.rc | 2 +- 154 files changed, 52 insertions(+), 34 deletions(-) diff --git a/COPYRIGHT.x2go-logos b/COPYRIGHT.x2go-logos index 3bf4c7b..54445da 100644 --- a/COPYRIGHT.x2go-logos +++ b/COPYRIGHT.x2go-logos @@ -2,21 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X2Go-artwork [~X] Upstream-Contact: Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> -Files: img/x2go-logos/mksizedsymbols.sh +Files: res/img/x2go-logos/mksizedsymbols.sh Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ - img/x2go-logos/x2go-logo-colored.svg - img/x2go-logos/x2go-logo.svg - img/x2go-logos/x2go-logo-rotated.svg - img/x2go-logos/x2go-mascot.svg + res/img/x2go-logos/x2go-logo-colored.svg + res/img/x2go-logos/x2go-logo.svg + res/img/x2go-logos/x2go-logo-rotated.svg + res/img/x2go-logos/x2go-mascot.svg Copyright: 2005-2015 Heinz-M. Grasesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ -Files: img/icons/16x16/x2goclient.png - img/icons/32x32/x2goclient.png - img/icons/48x48/x2goclient.png - img/icons/64x64/x2goclient.png - img/icons/128x128/x2goclient.png +Files: res/img/icons/16x16/x2goclient.png + res/img/icons/32x32/x2goclient.png + res/img/icons/48x48/x2goclient.png + res/img/icons/64x64/x2goclient.png + res/img/icons/128x128/x2goclient.png Copyright: 2005-2015 Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> License: GPL-2.0+ diff --git a/Makefile b/Makefile index 4f95d9c..0aac144 100755 --- a/Makefile +++ b/Makefile @@ -83,13 +83,13 @@ install_client: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps $(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient $(DESTDIR)$(BINDIR)/x2goclient $(INSTALL_FILE) desktop/x2goclient.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goclient.desktop - $(INSTALL_FILE) img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm - $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png - $(INSTALL_FILE) img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png - $(INSTALL_FILE) img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png - $(INSTALL_FILE) img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png - $(INSTALL_FILE) img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png - $(INSTALL_FILE) img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm + $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png + $(INSTALL_FILE) res/img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png + $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png + $(INSTALL_FILE) res/img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png install_plugin: $(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/ diff --git a/debian/changelog b/debian/changelog index c1fda89..8fb9399 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,12 +144,23 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium around messages, remove or add whitespace where applicable. - Move *.rc and *.rcc files back to top directory for now. Resources must be in the resource file's base directory or a sub-directory. - - Move icons/ to img/icons/ and update references in resources.rcc, - COPYRIGHT.x2go-logos, Makefile, debian/x2goclient.install, macbuild.sh, - nsis/x2goclient.nsi, src/onmainwindow.cpp, src/appdialog.cpp, - src/folderbutton.cpp, src/folderexplorer.cpp, src/sessionbutton.cpp, - src/sessionexplorer.cpp, src/sessionmanagedialog.cpp, - src/sessionwidget.cpp, src/ui/helpdialog.ui and src/xsettingswidget.cpp. + - Move icons/ to img/icons/ and update references in + + resources.rcc + + COPYRIGHT.x2go-logos + + Makefile + + debian/x2goclient.install + + macbuild.sh + + nsis/x2goclient.nsi + + src/onmainwindow.cpp + + src/appdialog.cpp + + src/folderbutton.cpp + + src/folderexplorer.cpp + + src/sessionbutton.cpp + + src/sessionexplorer.cpp + + src/sessionmanagedialog.cpp + + src/sessionwidget.cpp + + src/ui/helpdialog.ui + + src/xsettingswidget.cpp - Move png/ to img/png/ and update references in resources.rcc and src/onmainwindow.cpp. - Move svg/ to img/svg/ and update references in resources.rcc, @@ -168,6 +179,13 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium x2goclient.pro. - Remove executability bit from src/sshmasterconnection.cpp and src/sshprocess.cpp. + - Move img/ to res/img/ and update references in + + COPYRIGHT.x2go-logos + + Makefile + + debian/x2goclient.install + + macbuild.sh + + x2goclient.pro + + x2goclient.rc -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/x2goclient.install b/debian/x2goclient.install index 04ba470..0725ed4 100644 --- a/debian/x2goclient.install +++ b/debian/x2goclient.install @@ -1,9 +1,9 @@ client_build/x2goclient usr/bin desktop/x2goclient.desktop usr/share/applications/ -img/icons/x2goclient.xpm usr/share/x2goclient/icons/ -img/icons/128x128/x2goclient.png usr/share/x2goclient/icons/ -img/icons/128x128/x2gosession.png usr/share/x2goclient/icons/ -img/icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ -img/icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ -img/icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ -img/icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ +res/img/icons/x2goclient.xpm usr/share/x2goclient/icons/ +res/img/icons/128x128/x2goclient.png usr/share/x2goclient/icons/ +res/img/icons/128x128/x2gosession.png usr/share/x2goclient/icons/ +res/img/icons/128x128/x2goclient.png usr/share/icons/hicolor/128x128/apps/ +res/img/icons/16x16/x2goclient.png usr/share/icons/hicolor/16x16/apps/ +res/img/icons/64x64/x2goclient.png usr/share/icons/hicolor/64x64/apps/ +res/img/icons/32x32/x2goclient.png usr/share/icons/hicolor/32x32/apps/ diff --git a/macbuild.sh b/macbuild.sh index 115718c..bda1866 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -59,10 +59,10 @@ $PKG_DMG \ --volname "x2goclient" \ --verbosity 2 \ --mkdir "/.background" \ - --copy "./png/macinstaller_background.png:/.background" \ + --copy "./res/img/png/macinstaller_background.png:/.background" \ --copy "./macdmg.DS_Store:/.DS_Store" \ --copy "./LICENSE" \ --copy "./COPYING" \ --symlink "/Applications: " \ - --icon "./img/icons/x2go-mac.icns" \ + --icon "./res/img/icons/x2go-mac.icns" \ --format "UDBZ" diff --git a/img/icons/128x128/X.png b/res/img/icons/128x128/X.png similarity index 100% rename from img/icons/128x128/X.png rename to res/img/icons/128x128/X.png diff --git a/img/icons/128x128/audio.png b/res/img/icons/128x128/audio.png similarity index 100% rename from img/icons/128x128/audio.png rename to res/img/icons/128x128/audio.png diff --git a/img/icons/128x128/create_file.png b/res/img/icons/128x128/create_file.png similarity index 100% rename from img/icons/128x128/create_file.png rename to res/img/icons/128x128/create_file.png diff --git a/img/icons/128x128/delete.png b/res/img/icons/128x128/delete.png similarity index 100% rename from img/icons/128x128/delete.png rename to res/img/icons/128x128/delete.png diff --git a/img/icons/128x128/edit.png b/res/img/icons/128x128/edit.png similarity index 100% rename from img/icons/128x128/edit.png rename to res/img/icons/128x128/edit.png diff --git a/img/icons/128x128/edit_file.png b/res/img/icons/128x128/edit_file.png similarity index 100% rename from img/icons/128x128/edit_file.png rename to res/img/icons/128x128/edit_file.png diff --git a/img/icons/128x128/edit_settings.png b/res/img/icons/128x128/edit_settings.png similarity index 100% rename from img/icons/128x128/edit_settings.png rename to res/img/icons/128x128/edit_settings.png diff --git a/img/icons/128x128/file-open.png b/res/img/icons/128x128/file-open.png similarity index 100% rename from img/icons/128x128/file-open.png rename to res/img/icons/128x128/file-open.png diff --git a/img/icons/128x128/folder.png b/res/img/icons/128x128/folder.png similarity index 100% rename from img/icons/128x128/folder.png rename to res/img/icons/128x128/folder.png diff --git a/img/icons/128x128/gnome.png b/res/img/icons/128x128/gnome.png similarity index 100% rename from img/icons/128x128/gnome.png rename to res/img/icons/128x128/gnome.png diff --git a/img/icons/128x128/kde.png b/res/img/icons/128x128/kde.png similarity index 100% rename from img/icons/128x128/kde.png rename to res/img/icons/128x128/kde.png diff --git a/img/icons/128x128/lxde.png b/res/img/icons/128x128/lxde.png similarity index 100% rename from img/icons/128x128/lxde.png rename to res/img/icons/128x128/lxde.png diff --git a/img/icons/128x128/new_file.png b/res/img/icons/128x128/new_file.png similarity index 100% rename from img/icons/128x128/new_file.png rename to res/img/icons/128x128/new_file.png diff --git a/img/icons/128x128/preferences.png b/res/img/icons/128x128/preferences.png similarity index 100% rename from img/icons/128x128/preferences.png rename to res/img/icons/128x128/preferences.png diff --git a/img/icons/128x128/rdp.png b/res/img/icons/128x128/rdp.png similarity index 100% rename from img/icons/128x128/rdp.png rename to res/img/icons/128x128/rdp.png diff --git a/img/icons/128x128/resolution.png b/res/img/icons/128x128/resolution.png similarity index 100% rename from img/icons/128x128/resolution.png rename to res/img/icons/128x128/resolution.png diff --git a/img/icons/128x128/session.png b/res/img/icons/128x128/session.png similarity index 100% rename from img/icons/128x128/session.png rename to res/img/icons/128x128/session.png diff --git a/img/icons/128x128/unity.png b/res/img/icons/128x128/unity.png similarity index 100% rename from img/icons/128x128/unity.png rename to res/img/icons/128x128/unity.png diff --git a/img/icons/128x128/x2go.png b/res/img/icons/128x128/x2go.png similarity index 100% rename from img/icons/128x128/x2go.png rename to res/img/icons/128x128/x2go.png diff --git a/img/icons/128x128/x2goclient.png b/res/img/icons/128x128/x2goclient.png similarity index 100% rename from img/icons/128x128/x2goclient.png rename to res/img/icons/128x128/x2goclient.png diff --git a/img/icons/128x128/x2gogroup.png b/res/img/icons/128x128/x2gogroup.png similarity index 100% rename from img/icons/128x128/x2gogroup.png rename to res/img/icons/128x128/x2gogroup.png diff --git a/img/icons/128x128/x2gohosts.png b/res/img/icons/128x128/x2gohosts.png similarity index 100% rename from img/icons/128x128/x2gohosts.png rename to res/img/icons/128x128/x2gohosts.png diff --git a/img/icons/128x128/x2gomailclient.png b/res/img/icons/128x128/x2gomailclient.png similarity index 100% rename from img/icons/128x128/x2gomailclient.png rename to res/img/icons/128x128/x2gomailclient.png diff --git a/img/icons/128x128/x2gosession.png b/res/img/icons/128x128/x2gosession.png similarity index 100% rename from img/icons/128x128/x2gosession.png rename to res/img/icons/128x128/x2gosession.png diff --git a/img/icons/128x128/x2gouser.png b/res/img/icons/128x128/x2gouser.png similarity index 100% rename from img/icons/128x128/x2gouser.png rename to res/img/icons/128x128/x2gouser.png diff --git a/img/icons/16x16/X.png b/res/img/icons/16x16/X.png similarity index 100% rename from img/icons/16x16/X.png rename to res/img/icons/16x16/X.png diff --git a/img/icons/16x16/audio.png b/res/img/icons/16x16/audio.png similarity index 100% rename from img/icons/16x16/audio.png rename to res/img/icons/16x16/audio.png diff --git a/img/icons/16x16/cinnamon.png b/res/img/icons/16x16/cinnamon.png similarity index 100% rename from img/icons/16x16/cinnamon.png rename to res/img/icons/16x16/cinnamon.png diff --git a/img/icons/16x16/create_file.png b/res/img/icons/16x16/create_file.png similarity index 100% rename from img/icons/16x16/create_file.png rename to res/img/icons/16x16/create_file.png diff --git a/img/icons/16x16/delete.png b/res/img/icons/16x16/delete.png similarity index 100% rename from img/icons/16x16/delete.png rename to res/img/icons/16x16/delete.png diff --git a/img/icons/16x16/edit.png b/res/img/icons/16x16/edit.png similarity index 100% rename from img/icons/16x16/edit.png rename to res/img/icons/16x16/edit.png diff --git a/img/icons/16x16/edit_file.png b/res/img/icons/16x16/edit_file.png similarity index 100% rename from img/icons/16x16/edit_file.png rename to res/img/icons/16x16/edit_file.png diff --git a/img/icons/16x16/edit_settings.png b/res/img/icons/16x16/edit_settings.png similarity index 100% rename from img/icons/16x16/edit_settings.png rename to res/img/icons/16x16/edit_settings.png diff --git a/img/icons/16x16/file-open.png b/res/img/icons/16x16/file-open.png similarity index 100% rename from img/icons/16x16/file-open.png rename to res/img/icons/16x16/file-open.png diff --git a/img/icons/16x16/gnome.png b/res/img/icons/16x16/gnome.png similarity index 100% rename from img/icons/16x16/gnome.png rename to res/img/icons/16x16/gnome.png diff --git a/img/icons/16x16/icewm.png b/res/img/icons/16x16/icewm.png similarity index 100% rename from img/icons/16x16/icewm.png rename to res/img/icons/16x16/icewm.png diff --git a/img/icons/16x16/kde.png b/res/img/icons/16x16/kde.png similarity index 100% rename from img/icons/16x16/kde.png rename to res/img/icons/16x16/kde.png diff --git a/img/icons/16x16/lxde.png b/res/img/icons/16x16/lxde.png similarity index 100% rename from img/icons/16x16/lxde.png rename to res/img/icons/16x16/lxde.png diff --git a/img/icons/16x16/mate.png b/res/img/icons/16x16/mate.png similarity index 100% rename from img/icons/16x16/mate.png rename to res/img/icons/16x16/mate.png diff --git a/img/icons/16x16/new_file.png b/res/img/icons/16x16/new_file.png similarity index 100% rename from img/icons/16x16/new_file.png rename to res/img/icons/16x16/new_file.png diff --git a/img/icons/16x16/openbox.png b/res/img/icons/16x16/openbox.png similarity index 100% rename from img/icons/16x16/openbox.png rename to res/img/icons/16x16/openbox.png diff --git a/img/icons/16x16/preferences.png b/res/img/icons/16x16/preferences.png similarity index 100% rename from img/icons/16x16/preferences.png rename to res/img/icons/16x16/preferences.png diff --git a/img/icons/16x16/rdp.png b/res/img/icons/16x16/rdp.png similarity index 100% rename from img/icons/16x16/rdp.png rename to res/img/icons/16x16/rdp.png diff --git a/img/icons/16x16/resolution.png b/res/img/icons/16x16/resolution.png similarity index 100% rename from img/icons/16x16/resolution.png rename to res/img/icons/16x16/resolution.png diff --git a/img/icons/16x16/session.png b/res/img/icons/16x16/session.png similarity index 100% rename from img/icons/16x16/session.png rename to res/img/icons/16x16/session.png diff --git a/img/icons/16x16/tbshow.png b/res/img/icons/16x16/tbshow.png similarity index 100% rename from img/icons/16x16/tbshow.png rename to res/img/icons/16x16/tbshow.png diff --git a/img/icons/16x16/trinity.png b/res/img/icons/16x16/trinity.png similarity index 100% rename from img/icons/16x16/trinity.png rename to res/img/icons/16x16/trinity.png diff --git a/img/icons/16x16/unity.png b/res/img/icons/16x16/unity.png similarity index 100% rename from img/icons/16x16/unity.png rename to res/img/icons/16x16/unity.png diff --git a/img/icons/16x16/x2go.png b/res/img/icons/16x16/x2go.png similarity index 100% rename from img/icons/16x16/x2go.png rename to res/img/icons/16x16/x2go.png diff --git a/img/icons/16x16/x2goclient.png b/res/img/icons/16x16/x2goclient.png similarity index 100% rename from img/icons/16x16/x2goclient.png rename to res/img/icons/16x16/x2goclient.png diff --git a/img/icons/16x16/xfce.png b/res/img/icons/16x16/xfce.png similarity index 100% rename from img/icons/16x16/xfce.png rename to res/img/icons/16x16/xfce.png diff --git a/img/icons/22x22/applications-development.png b/res/img/icons/22x22/applications-development.png similarity index 100% rename from img/icons/22x22/applications-development.png rename to res/img/icons/22x22/applications-development.png diff --git a/img/icons/22x22/applications-education.png b/res/img/icons/22x22/applications-education.png similarity index 100% rename from img/icons/22x22/applications-education.png rename to res/img/icons/22x22/applications-education.png diff --git a/img/icons/22x22/applications-games.png b/res/img/icons/22x22/applications-games.png similarity index 100% rename from img/icons/22x22/applications-games.png rename to res/img/icons/22x22/applications-games.png diff --git a/img/icons/22x22/applications-graphics.png b/res/img/icons/22x22/applications-graphics.png similarity index 100% rename from img/icons/22x22/applications-graphics.png rename to res/img/icons/22x22/applications-graphics.png diff --git a/img/icons/22x22/applications-internet.png b/res/img/icons/22x22/applications-internet.png similarity index 100% rename from img/icons/22x22/applications-internet.png rename to res/img/icons/22x22/applications-internet.png diff --git a/img/icons/22x22/applications-multimedia.png b/res/img/icons/22x22/applications-multimedia.png similarity index 100% rename from img/icons/22x22/applications-multimedia.png rename to res/img/icons/22x22/applications-multimedia.png diff --git a/img/icons/22x22/applications-office.png b/res/img/icons/22x22/applications-office.png similarity index 100% rename from img/icons/22x22/applications-office.png rename to res/img/icons/22x22/applications-office.png diff --git a/img/icons/22x22/applications-other.png b/res/img/icons/22x22/applications-other.png similarity index 100% rename from img/icons/22x22/applications-other.png rename to res/img/icons/22x22/applications-other.png diff --git a/img/icons/22x22/applications-system.png b/res/img/icons/22x22/applications-system.png similarity index 100% rename from img/icons/22x22/applications-system.png rename to res/img/icons/22x22/applications-system.png diff --git a/img/icons/22x22/applications-utilities.png b/res/img/icons/22x22/applications-utilities.png similarity index 100% rename from img/icons/22x22/applications-utilities.png rename to res/img/icons/22x22/applications-utilities.png diff --git a/img/icons/22x22/preferences-system.png b/res/img/icons/22x22/preferences-system.png similarity index 100% rename from img/icons/22x22/preferences-system.png rename to res/img/icons/22x22/preferences-system.png diff --git a/img/icons/32x32/X.png b/res/img/icons/32x32/X.png similarity index 100% rename from img/icons/32x32/X.png rename to res/img/icons/32x32/X.png diff --git a/img/icons/32x32/apps.png b/res/img/icons/32x32/apps.png similarity index 100% rename from img/icons/32x32/apps.png rename to res/img/icons/32x32/apps.png diff --git a/img/icons/32x32/attach.png b/res/img/icons/32x32/attach.png similarity index 100% rename from img/icons/32x32/attach.png rename to res/img/icons/32x32/attach.png diff --git a/img/icons/32x32/audio.png b/res/img/icons/32x32/audio.png similarity index 100% rename from img/icons/32x32/audio.png rename to res/img/icons/32x32/audio.png diff --git a/img/icons/32x32/auth.png b/res/img/icons/32x32/auth.png similarity index 100% rename from img/icons/32x32/auth.png rename to res/img/icons/32x32/auth.png diff --git a/img/icons/32x32/contest.png b/res/img/icons/32x32/contest.png similarity index 100% rename from img/icons/32x32/contest.png rename to res/img/icons/32x32/contest.png diff --git a/img/icons/32x32/create_file.png b/res/img/icons/32x32/create_file.png similarity index 100% rename from img/icons/32x32/create_file.png rename to res/img/icons/32x32/create_file.png diff --git a/img/icons/32x32/delete.png b/res/img/icons/32x32/delete.png similarity index 100% rename from img/icons/32x32/delete.png rename to res/img/icons/32x32/delete.png diff --git a/img/icons/32x32/detach.png b/res/img/icons/32x32/detach.png similarity index 100% rename from img/icons/32x32/detach.png rename to res/img/icons/32x32/detach.png diff --git a/img/icons/32x32/edit.png b/res/img/icons/32x32/edit.png similarity index 100% rename from img/icons/32x32/edit.png rename to res/img/icons/32x32/edit.png diff --git a/img/icons/32x32/edit_file.png b/res/img/icons/32x32/edit_file.png similarity index 100% rename from img/icons/32x32/edit_file.png rename to res/img/icons/32x32/edit_file.png diff --git a/img/icons/32x32/edit_settings.png b/res/img/icons/32x32/edit_settings.png similarity index 100% rename from img/icons/32x32/edit_settings.png rename to res/img/icons/32x32/edit_settings.png diff --git a/img/icons/32x32/exit.png b/res/img/icons/32x32/exit.png similarity index 100% rename from img/icons/32x32/exit.png rename to res/img/icons/32x32/exit.png diff --git a/img/icons/32x32/file-open.png b/res/img/icons/32x32/file-open.png similarity index 100% rename from img/icons/32x32/file-open.png rename to res/img/icons/32x32/file-open.png diff --git a/img/icons/32x32/gnome.png b/res/img/icons/32x32/gnome.png similarity index 100% rename from img/icons/32x32/gnome.png rename to res/img/icons/32x32/gnome.png diff --git a/img/icons/32x32/kde.png b/res/img/icons/32x32/kde.png similarity index 100% rename from img/icons/32x32/kde.png rename to res/img/icons/32x32/kde.png diff --git a/img/icons/32x32/lxde.png b/res/img/icons/32x32/lxde.png similarity index 100% rename from img/icons/32x32/lxde.png rename to res/img/icons/32x32/lxde.png diff --git a/img/icons/32x32/new_file.png b/res/img/icons/32x32/new_file.png similarity index 100% rename from img/icons/32x32/new_file.png rename to res/img/icons/32x32/new_file.png diff --git a/img/icons/32x32/open_dir.png b/res/img/icons/32x32/open_dir.png similarity index 100% rename from img/icons/32x32/open_dir.png rename to res/img/icons/32x32/open_dir.png diff --git a/img/icons/32x32/preferences.png b/res/img/icons/32x32/preferences.png similarity index 100% rename from img/icons/32x32/preferences.png rename to res/img/icons/32x32/preferences.png diff --git a/img/icons/32x32/rdp.png b/res/img/icons/32x32/rdp.png similarity index 100% rename from img/icons/32x32/rdp.png rename to res/img/icons/32x32/rdp.png diff --git a/img/icons/32x32/reconnect.png b/res/img/icons/32x32/reconnect.png similarity index 100% rename from img/icons/32x32/reconnect.png rename to res/img/icons/32x32/reconnect.png diff --git a/img/icons/32x32/resolution.png b/res/img/icons/32x32/resolution.png similarity index 100% rename from img/icons/32x32/resolution.png rename to res/img/icons/32x32/resolution.png diff --git a/img/icons/32x32/session.png b/res/img/icons/32x32/session.png similarity index 100% rename from img/icons/32x32/session.png rename to res/img/icons/32x32/session.png diff --git a/img/icons/32x32/stop.png b/res/img/icons/32x32/stop.png similarity index 100% rename from img/icons/32x32/stop.png rename to res/img/icons/32x32/stop.png diff --git a/img/icons/32x32/stop_session.png b/res/img/icons/32x32/stop_session.png similarity index 100% rename from img/icons/32x32/stop_session.png rename to res/img/icons/32x32/stop_session.png diff --git a/img/icons/32x32/suspend.png b/res/img/icons/32x32/suspend.png similarity index 100% rename from img/icons/32x32/suspend.png rename to res/img/icons/32x32/suspend.png diff --git a/img/icons/32x32/suspend_session.png b/res/img/icons/32x32/suspend_session.png similarity index 100% rename from img/icons/32x32/suspend_session.png rename to res/img/icons/32x32/suspend_session.png diff --git a/img/icons/32x32/tbhide.png b/res/img/icons/32x32/tbhide.png similarity index 100% rename from img/icons/32x32/tbhide.png rename to res/img/icons/32x32/tbhide.png diff --git a/img/icons/32x32/tbshow.png b/res/img/icons/32x32/tbshow.png similarity index 100% rename from img/icons/32x32/tbshow.png rename to res/img/icons/32x32/tbshow.png diff --git a/img/icons/32x32/tbshow.xcf b/res/img/icons/32x32/tbshow.xcf similarity index 100% rename from img/icons/32x32/tbshow.xcf rename to res/img/icons/32x32/tbshow.xcf diff --git a/img/icons/32x32/unity.png b/res/img/icons/32x32/unity.png similarity index 100% rename from img/icons/32x32/unity.png rename to res/img/icons/32x32/unity.png diff --git a/img/icons/32x32/x2goclient.png b/res/img/icons/32x32/x2goclient.png similarity index 100% rename from img/icons/32x32/x2goclient.png rename to res/img/icons/32x32/x2goclient.png diff --git a/img/icons/48x48/x2goclient.png b/res/img/icons/48x48/x2goclient.png similarity index 100% rename from img/icons/48x48/x2goclient.png rename to res/img/icons/48x48/x2goclient.png diff --git a/img/icons/64x64/X.png b/res/img/icons/64x64/X.png similarity index 100% rename from img/icons/64x64/X.png rename to res/img/icons/64x64/X.png diff --git a/img/icons/64x64/audio.png b/res/img/icons/64x64/audio.png similarity index 100% rename from img/icons/64x64/audio.png rename to res/img/icons/64x64/audio.png diff --git a/img/icons/64x64/create_file.png b/res/img/icons/64x64/create_file.png similarity index 100% rename from img/icons/64x64/create_file.png rename to res/img/icons/64x64/create_file.png diff --git a/img/icons/64x64/delete.png b/res/img/icons/64x64/delete.png similarity index 100% rename from img/icons/64x64/delete.png rename to res/img/icons/64x64/delete.png diff --git a/img/icons/64x64/edit.png b/res/img/icons/64x64/edit.png similarity index 100% rename from img/icons/64x64/edit.png rename to res/img/icons/64x64/edit.png diff --git a/img/icons/64x64/edit_file.png b/res/img/icons/64x64/edit_file.png similarity index 100% rename from img/icons/64x64/edit_file.png rename to res/img/icons/64x64/edit_file.png diff --git a/img/icons/64x64/edit_settings.png b/res/img/icons/64x64/edit_settings.png similarity index 100% rename from img/icons/64x64/edit_settings.png rename to res/img/icons/64x64/edit_settings.png diff --git a/img/icons/64x64/file-open.png b/res/img/icons/64x64/file-open.png similarity index 100% rename from img/icons/64x64/file-open.png rename to res/img/icons/64x64/file-open.png diff --git a/img/icons/64x64/gnome.png b/res/img/icons/64x64/gnome.png similarity index 100% rename from img/icons/64x64/gnome.png rename to res/img/icons/64x64/gnome.png diff --git a/img/icons/64x64/kde.png b/res/img/icons/64x64/kde.png similarity index 100% rename from img/icons/64x64/kde.png rename to res/img/icons/64x64/kde.png diff --git a/img/icons/64x64/lxde.png b/res/img/icons/64x64/lxde.png similarity index 100% rename from img/icons/64x64/lxde.png rename to res/img/icons/64x64/lxde.png diff --git a/img/icons/64x64/new_file.png b/res/img/icons/64x64/new_file.png similarity index 100% rename from img/icons/64x64/new_file.png rename to res/img/icons/64x64/new_file.png diff --git a/img/icons/64x64/personal.png b/res/img/icons/64x64/personal.png similarity index 100% rename from img/icons/64x64/personal.png rename to res/img/icons/64x64/personal.png diff --git a/img/icons/64x64/preferences.png b/res/img/icons/64x64/preferences.png similarity index 100% rename from img/icons/64x64/preferences.png rename to res/img/icons/64x64/preferences.png diff --git a/img/icons/64x64/rdp.png b/res/img/icons/64x64/rdp.png similarity index 100% rename from img/icons/64x64/rdp.png rename to res/img/icons/64x64/rdp.png diff --git a/img/icons/64x64/resolution.png b/res/img/icons/64x64/resolution.png similarity index 100% rename from img/icons/64x64/resolution.png rename to res/img/icons/64x64/resolution.png diff --git a/img/icons/64x64/session.png b/res/img/icons/64x64/session.png similarity index 100% rename from img/icons/64x64/session.png rename to res/img/icons/64x64/session.png diff --git a/img/icons/64x64/unity.png b/res/img/icons/64x64/unity.png similarity index 100% rename from img/icons/64x64/unity.png rename to res/img/icons/64x64/unity.png diff --git a/img/icons/64x64/x2goclient.png b/res/img/icons/64x64/x2goclient.png similarity index 100% rename from img/icons/64x64/x2goclient.png rename to res/img/icons/64x64/x2goclient.png diff --git a/img/icons/hildon/x2goclient_26.png b/res/img/icons/hildon/x2goclient_26.png similarity index 100% rename from img/icons/hildon/x2goclient_26.png rename to res/img/icons/hildon/x2goclient_26.png diff --git a/img/icons/hildon/x2goclient_40.png b/res/img/icons/hildon/x2goclient_40.png similarity index 100% rename from img/icons/hildon/x2goclient_40.png rename to res/img/icons/hildon/x2goclient_40.png diff --git a/img/icons/hildon/x2goclient_64.png b/res/img/icons/hildon/x2goclient_64.png similarity index 100% rename from img/icons/hildon/x2goclient_64.png rename to res/img/icons/hildon/x2goclient_64.png diff --git a/img/icons/hildon/x2goclient_hildon.svg b/res/img/icons/hildon/x2goclient_hildon.svg similarity index 100% rename from img/icons/hildon/x2goclient_hildon.svg rename to res/img/icons/hildon/x2goclient_hildon.svg diff --git a/img/icons/x2go-mac.icns b/res/img/icons/x2go-mac.icns similarity index 100% rename from img/icons/x2go-mac.icns rename to res/img/icons/x2go-mac.icns diff --git a/img/icons/x2go-win-48.ico b/res/img/icons/x2go-win-48.ico similarity index 100% rename from img/icons/x2go-win-48.ico rename to res/img/icons/x2go-win-48.ico diff --git a/img/icons/x2goclient.xpm b/res/img/icons/x2goclient.xpm similarity index 100% rename from img/icons/x2goclient.xpm rename to res/img/icons/x2goclient.xpm diff --git a/img/png/ico.png b/res/img/png/ico.png similarity index 100% rename from img/png/ico.png rename to res/img/png/ico.png diff --git a/img/png/ico_440x180.png b/res/img/png/ico_440x180.png similarity index 100% rename from img/png/ico_440x180.png rename to res/img/png/ico_440x180.png diff --git a/img/png/ico_mini.png b/res/img/png/ico_mini.png similarity index 100% rename from img/png/ico_mini.png rename to res/img/png/ico_mini.png diff --git a/img/png/macinstaller_background.png b/res/img/png/macinstaller_background.png similarity index 100% rename from img/png/macinstaller_background.png rename to res/img/png/macinstaller_background.png diff --git a/img/png/power-button.png b/res/img/png/power-button.png similarity index 100% rename from img/png/power-button.png rename to res/img/png/power-button.png diff --git a/img/png/sess_ico.png b/res/img/png/sess_ico.png similarity index 100% rename from img/png/sess_ico.png rename to res/img/png/sess_ico.png diff --git a/img/svg/bg-anim.svg b/res/img/svg/bg-anim.svg similarity index 100% rename from img/svg/bg-anim.svg rename to res/img/svg/bg-anim.svg diff --git a/img/svg/bg.svg b/res/img/svg/bg.svg similarity index 100% rename from img/svg/bg.svg rename to res/img/svg/bg.svg diff --git a/img/svg/bg_hildon.svg b/res/img/svg/bg_hildon.svg similarity index 100% rename from img/svg/bg_hildon.svg rename to res/img/svg/bg_hildon.svg diff --git a/img/svg/folder.svg b/res/img/svg/folder.svg similarity index 100% rename from img/svg/folder.svg rename to res/img/svg/folder.svg diff --git a/img/svg/folder_grey.svg b/res/img/svg/folder_grey.svg similarity index 100% rename from img/svg/folder_grey.svg rename to res/img/svg/folder_grey.svg diff --git a/img/svg/line.svg b/res/img/svg/line.svg similarity index 100% rename from img/svg/line.svg rename to res/img/svg/line.svg diff --git a/img/svg/macinstaller_background.svg b/res/img/svg/macinstaller_background.svg similarity index 100% rename from img/svg/macinstaller_background.svg rename to res/img/svg/macinstaller_background.svg diff --git a/img/svg/onlogo.svg b/res/img/svg/onlogo.svg similarity index 100% rename from img/svg/onlogo.svg rename to res/img/svg/onlogo.svg diff --git a/img/svg/passform.svg b/res/img/svg/passform.svg similarity index 100% rename from img/svg/passform.svg rename to res/img/svg/passform.svg diff --git a/img/svg/sessionbut.svg b/res/img/svg/sessionbut.svg similarity index 100% rename from img/svg/sessionbut.svg rename to res/img/svg/sessionbut.svg diff --git a/img/svg/sessionbut_grey.svg b/res/img/svg/sessionbut_grey.svg similarity index 100% rename from img/svg/sessionbut_grey.svg rename to res/img/svg/sessionbut_grey.svg diff --git a/img/svg/unity.svg b/res/img/svg/unity.svg similarity index 100% rename from img/svg/unity.svg rename to res/img/svg/unity.svg diff --git a/img/svg/x2gologo.svg b/res/img/svg/x2gologo.svg similarity index 100% rename from img/svg/x2gologo.svg rename to res/img/svg/x2gologo.svg diff --git a/img/svg/xfce.svg b/res/img/svg/xfce.svg similarity index 100% rename from img/svg/xfce.svg rename to res/img/svg/xfce.svg diff --git a/img/x2go-logos/mksizedsymbols.sh b/res/img/x2go-logos/mksizedsymbols.sh similarity index 100% rename from img/x2go-logos/mksizedsymbols.sh rename to res/img/x2go-logos/mksizedsymbols.sh diff --git a/img/x2go-logos/x2go-logo-colored.svg b/res/img/x2go-logos/x2go-logo-colored.svg similarity index 100% rename from img/x2go-logos/x2go-logo-colored.svg rename to res/img/x2go-logos/x2go-logo-colored.svg diff --git a/img/x2go-logos/x2go-logo-rotated.svg b/res/img/x2go-logos/x2go-logo-rotated.svg similarity index 100% rename from img/x2go-logos/x2go-logo-rotated.svg rename to res/img/x2go-logos/x2go-logo-rotated.svg diff --git a/img/x2go-logos/x2go-logo.svg b/res/img/x2go-logos/x2go-logo.svg similarity index 100% rename from img/x2go-logos/x2go-logo.svg rename to res/img/x2go-logos/x2go-logo.svg diff --git a/img/x2go-logos/x2go-mascot.svg b/res/img/x2go-logos/x2go-mascot.svg similarity index 100% rename from img/x2go-logos/x2go-mascot.svg rename to res/img/x2go-logos/x2go-mascot.svg diff --git a/x2goclient.pro b/x2goclient.pro index 5556de8..3579dc3 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -193,7 +193,7 @@ win32-* { CONFIG += static release } QT += svg network -ICON = img/icons/x2go-mac.icns +ICON = res/img/icons/x2go-mac.icns QMAKE_INFO_PLIST = Info.plist plugin { diff --git a/x2goclient.rc b/x2goclient.rc index f2f6729..82ea93e 100644 --- a/x2goclient.rc +++ b/x2goclient.rc @@ -1,2 +1,2 @@ -IDI_ICON1 ICON DISCARDABLE "img/icons/x2go-win-48.ico" +IDI_ICON1 ICON DISCARDABLE "res/img/icons/x2go-win-48.ico" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 239179db3b76c4d93fb7cb67af378b5a5caf2919 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:02:37 2015 +0100 general: move txt/ to res/text/ and update references in: - x2goclient.pro - Makefile - debian/rules - x2goclient.spec --- Makefile | 4 ++-- debian/changelog | 5 +++++ debian/rules | 6 +++--- {txt => res/txt}/encodings | 0 {txt => res/txt}/packs | 0 x2goclient.pro | 4 ++-- x2goclient.spec | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0aac144..bde4f0c 100755 --- a/Makefile +++ b/Makefile @@ -57,8 +57,8 @@ clean: clean_client clean_plugin clean_man clean_pluginprovider find . -maxdepth 3 -name 'qrc_*.cpp' -exec rm -vf {} + -type f rm -f x2goclient rm -f x2goclient.tag - rm -f txt/changelog - rm -f txt/git-info + rm -f res/txt/changelog + rm -f res/txt/git-info clean_client: rm -fr $(CLIENT_DIR) diff --git a/debian/changelog b/debian/changelog index 63c5479..3e0dcdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -193,6 +193,11 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium + resources.rcc to res/ and update references in x2goclient.pro and src/ui/helpdialog.ui. - Reference new src directory as include dir in x2goclient.pro. + - Move txt/ to res/text/ and update references in + + x2goclient.pro + + Makefile + + debian/rules + + x2goclient.spec -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/debian/rules b/debian/rules index 8f05dda..288b6a8 100755 --- a/debian/rules +++ b/debian/rules @@ -9,15 +9,15 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) dh $@ --parallel --with apache2 || dh $@ --parallel override_dh_auto_configure: - cp debian/changelog txt/changelog - if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog txt/git-info; fi + cp debian/changelog res/txt/changelog + if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog res/txt/git-info; fi dh_auto_configure override_dh_auto_clean: dh_auto_clean # clean stray .qm files that are not handled by clean rule in upstream Makefile rm -Rf res/i18n/x2goclient_*.qm - rm -f txt/changelog + rm -f res/txt/changelog override_dh_strip: dh_strip -p x2goclient --dbg-package=x2goclient-dbg diff --git a/txt/encodings b/res/txt/encodings similarity index 100% rename from txt/encodings rename to res/txt/encodings diff --git a/txt/packs b/res/txt/packs similarity index 100% rename from txt/packs rename to res/txt/packs diff --git a/x2goclient.pro b/x2goclient.pro index 15b1178..9ac24a5 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -155,12 +155,12 @@ DEPENDPATH += . INCLUDEPATH += src RESOURCES += res/resources.rcc -exists(txt/git-info) { +exists(res/txt/git-info) { message("Configuring with --git-info") RESOURCES += res/git.rcc } -exists(txt/changelog) { +exists(res/txt/changelog) { message("Configuring with --changelog") RESOURCES += res/changelog.rcc } diff --git a/x2goclient.spec b/x2goclient.spec index 937557a..41ae8ea 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -150,8 +150,8 @@ the X2Go Plugin via an Apache webserver. # Fix up install issues sed -i -e 's/-o root -g root//' Makefile sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile -test -f ChangeLog && cp ChangeLog txt/changelog || test -f debian/changelog && cp debian/changelog txt/changelog || true -test -f ChangeLog.gitlog && cp ChangeLog.gitlog txt/git-info || true +test -f ChangeLog && cp ChangeLog res/txt/changelog || test -f debian/changelog && cp debian/changelog res/txt/changelog || true +test -f ChangeLog.gitlog && cp ChangeLog.gitlog res/txt/git-info || true %if 0%{?el5} sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_libdir}/qt4/bin/qmake@' Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_libdir}/qt4/bin/lrelease@' Makefile -- Alioth's /srv/git/code.x2go.org/x2goclient.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 8d918a87b635cc67c480476ea22c3a68ec51e292 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:10:55 2015 +0100 Info.plist: whitespace fix. --- Info.plist | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Info.plist b/Info.plist index 69e0cb8..3c4bc90 100644 --- a/Info.plist +++ b/Info.plist @@ -6,7 +6,7 @@ <string>x2go-mac.icns</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleGetInfoString</key> + <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> <key>CFBundleSignature</key> <string>????</string> diff --git a/debian/changelog b/debian/changelog index 3e0dcdd..31cb36e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -198,6 +198,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium + Makefile + debian/rules + x2goclient.spec + - Whitespace fix in Info.plist. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 f222df47b7e2ee04c3c340c2c93d7da3b9b0cf6f Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:16:32 2015 +0100 macbuild.sh: use more quoting and curly braces for referencing variables. --- debian/changelog | 2 ++ macbuild.sh | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 31cb36e..8381f8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -199,6 +199,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium + debian/rules + x2goclient.spec - Whitespace fix in Info.plist. + - Use more quoting and curly braces for referencing variables in + macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index bda1866..729ec13 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,15 +1,15 @@ #!/bin/sh -NAME=x2goclient -APPBUNDLE=./$NAME.app -DMGFILE=./$NAME.dmg -PROJECT=./$NAME.pro -PKG_DMG=./pkg-dmg +NAME="x2goclient" +APPBUNDLE="./${NAME}.app" +DMGFILE="./${NAME}.dmg" +PROJECT="./${NAME}.pro" +PKG_DMG="./pkg-dmg" -NXPROXY=`which nxproxy` -LIBXCOMP=libXcomp.3.dylib -LIBPNG=libpng15.15.dylib -LIBJPEG=libjpeg.9.dylib -LIBZ=libz.1.dylib +NXPROXY="$(which nxproxy)" +LIBXCOMP="libXcomp.3.dylib" +LIBPNG="libpng15.15.dylib" +LIBJPEG="libjpeg.9.dylib" +LIBZ="libz.1.dylib" set -e @@ -39,23 +39,23 @@ phase "Running make" make -j2 phase "Copying nxproxy" -mkdir -p "$APPBUNDLE/Contents/exe" -cp "$NXPROXY" "$APPBUNDLE/Contents/exe" +mkdir -p "${APPBUNDLE}/Contents/exe" +cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe" dylibbundler \ - --fix-file "$APPBUNDLE/Contents/exe/nxproxy" \ + --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ --bundle-deps \ - --dest-dir "$APPBUNDLE/Contents/Frameworks" \ + --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ --install-path "@executable_path/../Frameworks/" \ --create-dir phase "Bundling up using macdeployqt" -macdeployqt "$APPBUNDLE" -verbose=2 +macdeployqt "${APPBUNDLE}" -verbose=2 phase "Creating DMG" -$PKG_DMG \ - --source "$APPBUNDLE" \ +${PKG_DMG} \ + --source "${APPBUNDLE}" \ --sourcefile \ - --target "$DMGFILE" \ + --target "${DMGFILE}" \ --volname "x2goclient" \ --verbosity 2 \ --mkdir "/.background" \ -- Alioth's /srv/git/code.x2go.org/x2goclient.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 07af2ea9c28f4c9ad92fcdc54d941f2688c91a53 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:37:55 2015 +0100 macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment. Default to the 10.7 SDK and deployment target. Use the variables when calling qmake. --- debian/changelog | 4 ++++ macbuild.sh | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8841cb..0f1a7f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -202,6 +202,10 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Use more quoting and curly braces for referencing variables in macbuild.sh. - Define TOP_DIR variable in macbuild.sh -- set to $PWD. + - Define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET in + macbuild.sh which can also be (pre-)set through the environment. Default + to the 10.7 SDK and deployment target. Use the variables when calling + qmake. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index fafce18..30944ff 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -13,6 +13,9 @@ LIBPNG="libpng15.15.dylib" LIBJPEG="libjpeg.9.dylib" LIBZ="libz.1.dylib" +: SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" +: MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" + set -e function phase() { @@ -34,8 +37,8 @@ lrelease "$PROJECT" phase "Running qmake" qmake -config release \ CONFIG+=x86_64 \ - QMAKE_MAC_SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk \ - QMAKE_MACOSX_DEPLOYMENT_TARGET=10.7 + QMAKE_MAC_SDK="${SDK}" \ + QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" phase "Running make" make -j2 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 a9f850695553e0bf7d90aed84ff1aaf23ff09499 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:42:43 2015 +0100 macbuild.sh: specify -spec macx-g++ when using qmake. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0f1a7f4..469efeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -206,6 +206,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium macbuild.sh which can also be (pre-)set through the environment. Default to the 10.7 SDK and deployment target. Use the variables when calling qmake. + - Specify -spec macx-g++ when using qmake in macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 2d583c2..cf29d4f 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,7 +35,7 @@ phase "Running lrelease" lrelease "${PROJECT}" phase "Running qmake" -qmake -config release \ +qmake -config release -spec macx-g++ \ CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 128978e9ca8b4efc7e52e3dde0213451e8017ba5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 05:54:27 2015 +0100 macbuild.sh: also also specify the top dir when defining the path to the generated appbundle and dmg file. --- debian/changelog | 2 ++ macbuild.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e1e292..ddd9e7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -210,6 +210,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Directly reference project file for qmake in macbuild.sh. - Use out-of-source build and do not overwrite the default shipped Makefile in macbuild.sh. + - Also also specify the top dir when defining the path to the generated + appbundle and dmg file in macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index ac3cb4e..f8e369b 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -2,8 +2,8 @@ NAME="x2goclient" TOP_DIR="${PWD}" BUILD_DIR="${TOP_DIR}/build_client" -APPBUNDLE="${BUILD_DIR}/${NAME}.app" -DMGFILE="${BUILD_DIR}/${NAME}.dmg" +APPBUNDLE="${TOP_DIR}/${BUILD_DIR}/${NAME}.app" +DMGFILE="${TOP_DIR}/${BUILD_DIR}/${NAME}.dmg" PROJECT="${TOP_DIR}/${NAME}.pro" PKG_DMG="${TOP_DIR}/pkg-dmg" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 bd8785f80f11e325ede82c7c63b604f2e63532fe Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 06:22:50 2015 +0100 macbuild.sh: BUILD_DIR already includes TOP_DIR, don't specify it two times. --- macbuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macbuild.sh b/macbuild.sh index f8e369b..ac3cb4e 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -2,8 +2,8 @@ NAME="x2goclient" TOP_DIR="${PWD}" BUILD_DIR="${TOP_DIR}/build_client" -APPBUNDLE="${TOP_DIR}/${BUILD_DIR}/${NAME}.app" -DMGFILE="${TOP_DIR}/${BUILD_DIR}/${NAME}.dmg" +APPBUNDLE="${BUILD_DIR}/${NAME}.app" +DMGFILE="${BUILD_DIR}/${NAME}.dmg" PROJECT="${TOP_DIR}/${NAME}.pro" PKG_DMG="${TOP_DIR}/pkg-dmg" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 6ac47cc8d31a370e27587b42deba46f52140c6da Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 07:30:39 2015 +0100 x2goclient.pro: work around another bug in qmake and copy icon "manually". --- debian/changelog | 1 + x2goclient.pro | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5751e39..d2c962f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -216,6 +216,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Fix references of resources in macbuild.sh to access files from TOP_DIR. - Work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. + - Work around another bug in qmake and copy icon "manually". -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index c4b75cb..9d5ca8a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -196,12 +196,15 @@ QT += svg network ICON = $${PWD}/res/img/icons/x2go-mac.icns # Strictly speaking, this is a bug in qmake and we should neither need $${PWD} -# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS. +# nor QMAKE_INFO_PLIST_OUT nor PRE_TARGETDEPS nor QMAKE_POST_LINK. # Not defining the latter two will however lead to it being empty and no -# Info.plist file being created in the first place. Bummer. +# Info.plist file being created in the first place. +# The last command takes care of actually putting the icon in place - yet +# another bug in qmake. Bummer. QMAKE_INFO_PLIST = $${PWD}/res/Info.plist QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist +QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ plugin { DEFINES += CFGPLUGIN -- Alioth's /srv/git/code.x2go.org/x2goclient.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 537eb40a1118fc2a14b44d46575a2f059c25131b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 23:19:07 2015 +0100 sessionbuttons/userbuttons: add some debugging output to see what file path is being used as a pixmap (user photo/session icon.) --- debian/changelog | 2 ++ src/onmainwindow.cpp | 1 + src/sessionbutton.cpp | 1 + 3 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3be5f91..a77b4db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -219,6 +219,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Work around another bug in qmake and copy icon "manually". - Define wrap_legacy_resources() function and use it to wrap legacy resource locations stored in old session config files. + - Add some debugging output to sessionbuttons/userbutton to see what file + path is being used as a pixmap (user photo/session icon.) -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 1d03927..bdf2a55 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2599,6 +2599,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) selectedCommand=command.split("/").last(); command=transAppName ( command ); login->setText ( userName ); + x2goDebug << "creating QPixmap with session icon: '" << sessIcon << "'."; QPixmap pix ( sessIcon ); if ( !miniMode ) { diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index 10bf4d8..5690323 100644 --- a/src/sessionbutton.cpp +++ b/src/sessionbutton.cpp @@ -317,6 +317,7 @@ void SessionButton::redraw() sessIcon = expandHome(sessIcon); QPixmap* pix; + x2goDebug << "creating QPixmap with session icon: '" << sessIcon.toAscii () << "'."; if (!par->brokerMode || sessIcon == ":/img/icons/128x128/x2gosession.png") pix=new QPixmap( sessIcon ); else -- Alioth's /srv/git/code.x2go.org/x2goclient.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 a7f1a88ab997071e670c63847ab75d0e2b2dd543 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 23:22:40 2015 +0100 x2goutils: update copyright -- add myself. --- debian/changelog | 1 + src/x2goutils.cpp | 3 ++- src/x2goutils.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a77b4db..202afe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -221,6 +221,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium resource locations stored in old session config files. - Add some debugging output to sessionbuttons/userbutton to see what file path is being used as a pixmap (user photo/session icon.) + - Add myself to copyright section in the x2goutils headers. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index 5226c47..1dadb3b 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -1,6 +1,7 @@ /************************************************************************** * Copyright (C) 2005-2015 by Oleksandr Shneyder * -* o.shneyder@phoca-gmbh.de * +* <o.shneyder@phoca-gmbh.de> * +* Copyright (C) 2015 by Mihai Moldovan <ionic@ionic.de> * * * * 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 * diff --git a/src/x2goutils.h b/src/x2goutils.h index 84bed3c..0ff2e8e 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -1,6 +1,7 @@ /************************************************************************** * Copyright (C) 2005-2015 by Oleksandr Shneyder * -* o.shneyder@phoca-gmbh.de * +* <o.shneyder@phoca-gmbh.de> * +* Copyright (C) 2015 by Mihai Moldovan <ionic@ionic.de> * * * * 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 * -- Alioth's /srv/git/code.x2go.org/x2goclient.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 bbc466eb8202ef2c6f923c73b0fb6eaed50bfcce Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 23:28:35 2015 +0100 x2goutils.cpp: use constBegin() and constEnd() instead of begin/end... --- src/x2goutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index 8ddad3b..36ffac9 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -42,8 +42,8 @@ QString wrap_legacy_resources (const QString res_path) { bool detected = false; /* This would be so much easier with C++ and lambdas... */ - QString::const_iterator it = legacy_locations.begin (); - while (it != legacy_locations.end ()) { + QString::const_iterator it = legacy_locations.constBegin (); + while (it != legacy_locations.constEnd ()) { if (res_path.startsWith (*(it++))) { detected = true; break; -- Alioth's /srv/git/code.x2go.org/x2goclient.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 ec4c29273e144e76e454a22aa19804f750ddb4f9 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 23:45:32 2015 +0100 x2goutils.cpp: actually use the correct iterator types and functions. --- src/x2goutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index 36ffac9..d1ad13d 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -42,8 +42,8 @@ QString wrap_legacy_resources (const QString res_path) { bool detected = false; /* This would be so much easier with C++ and lambdas... */ - QString::const_iterator it = legacy_locations.constBegin (); - while (it != legacy_locations.constEnd ()) { + std::vector<QString>::const_iterator it = legacy_locations.begin (); + while (it != legacy_locations.end ()) { if (res_path.startsWith (*(it++))) { detected = true; break; -- Alioth's /srv/git/code.x2go.org/x2goclient.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 5bbfdde880eae5fa30ad06053ef5118fcf25a441 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:00:01 2015 +0100 sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). --- src/sessionexplorer.cpp | 8 +++----- src/sessionwidget.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp index fcdd719..5e54c0d 100644 --- a/src/sessionexplorer.cpp +++ b/src/sessionexplorer.cpp @@ -167,11 +167,9 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt ) name.replace("/","::"); - QString sessIcon=st.setting()->value ( - bt->id() +"/icon", - ( QVariant ) - ":/img/icons/128x128/x2gosession.png" - ).toString(); + QString sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (bt->id() + "/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ()); sessIcon = expandHome(sessIcon); if ( sessIcon.startsWith ( ":/img/icons",Qt::CaseInsensitive ) || !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) ) diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index e49b718..13abd99 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -409,7 +409,7 @@ void SessionWidget::slot_getIcon() tr ( "Pictures" ) +" (*.png *.xpm *.jpg)" ); if ( path!=QString::null ) { - sessIcon=path; + sessIcon = wrap_legacy_resource_URIs (path); icon->setIcon ( QIcon ( sessIcon ) ); } } @@ -545,10 +545,10 @@ void SessionWidget::readConfig() sessName->setText (name); - sessIcon=st.setting()->value ( - sessionId+"/icon", - ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString().trimmed(); - sessIcon=expandHome(sessIcon); + sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (sessionId+"/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ().trimmed ()); + sessIcon = expandHome (sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( -- Alioth's /srv/git/code.x2go.org/x2goclient.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 fcaa63a5e5bbb21278e528419084bfb3f83fd45a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:50:55 2015 +0100 x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. --- debian/changelog | 1 + x2goclient.pro | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index f971572..05e1c86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -230,6 +230,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in x2goclient.pro and macbuild.sh. - Add debug mode selector via DEBUG env variable to macbuild.sh. + - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index e3ee3ce..5a195bd 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -206,6 +206,9 @@ QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ +QMAKE_CXXFLAGS_DEBUG -= -g +QMAKE_CXXFLAGS_DEBUG += -g3 -ggdb3 -gdwarf-4 + plugin { DEFINES += CFGPLUGIN linux-g++ { -- Alioth's /srv/git/code.x2go.org/x2goclient.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 5ba56c49d4064fa51cab652f10dce2f9434c52f3 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:17:13 2015 +0100 macbuild.sh: fix TOP_DIR handling. --- debian/changelog | 1 + macbuild.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 89d464c..d7a68bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -232,6 +232,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Add debug mode selector via DEBUG env variable to macbuild.sh. - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. - Select stdlib on OS X based on the passed or default SDK value. + - Fix TOP_DIR handling in macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 642f6f3..603088a 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,6 +1,8 @@ #!/bin/sh NAME="x2goclient" -TOP_DIR="${PWD}" + +TOP_DIR="$(dirname "$0")" +[[ "${TOP_DIR}" == /* ]] || TOP_DIR="${PWD}/${TOP_DIR#./}" BUILD_DIR="${TOP_DIR}/build_client" APPBUNDLE="${BUILD_DIR}/${NAME}.app" DMGFILE="${BUILD_DIR}/${NAME}.dmg" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 aec9cace8a8ff30abd1b9695263c6e082d0a4cc9 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:20:15 2015 +0100 macbuild.sh: switch to BASH interpreter. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d7a68bc..6f93c2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -233,6 +233,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. - Select stdlib on OS X based on the passed or default SDK value. - Fix TOP_DIR handling in macbuild.sh. + - Switch to BASH interpreter for macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 603088a..921b2a4 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash NAME="x2goclient" TOP_DIR="$(dirname "$0")" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 59a0bca3bec7ebe63fe955849b62778e6d9b6b12 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:24:32 2015 +0100 macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. --- debian/changelog | 2 ++ macbuild.sh | 59 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82654e9..9c5075c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -235,6 +235,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Fix TOP_DIR handling in macbuild.sh. - Switch to BASH interpreter for macbuild.sh. - Also accept "FALSE" and "false" as binary values in macbuild.sh. + - Make bundling optional (but enabled by default) via the new BUNDLE + environment variable in macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index ffe2d5b..4df34b4 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -18,12 +18,18 @@ LIBZ="libz.1.dylib" SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" DEBUG="${DEBUG:-"0"}" +BUNDLE="${BUNDLE:-"1"}" case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; (*) BUILD_MODE="debug";; esac +case "${BUNDLE}" in + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUNDLE="0";; + (*) BUNDLE="1";; +esac + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -71,30 +77,33 @@ make -j2 phase "Copying nxproxy" mkdir -p "${APPBUNDLE}/Contents/exe" cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe" -dylibbundler \ - --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ - --bundle-deps \ - --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ - --install-path "@executable_path/../Frameworks/" \ - --create-dir - -phase "Bundling up using macdeployqt" -macdeployqt "${APPBUNDLE}" -verbose=2 - -phase "Creating DMG" -${PKG_DMG} \ - --source "${APPBUNDLE}" \ - --sourcefile \ - --target "${DMGFILE}" \ - --volname "x2goclient" \ - --verbosity 2 \ - --mkdir "/.background" \ - --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ - --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ - --copy "${TOP_DIR}/LICENSE" \ - --copy "${TOP_DIR}/COPYING" \ - --symlink "/Applications: " \ - --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ - --format "UDBZ" + +if [ "${BUNDLE}" = "1" ]; then + dylibbundler \ + --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ + --bundle-deps \ + --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ + --install-path "@executable_path/../Frameworks/" \ + --create-dir + + phase "Bundling up using macdeployqt" + macdeployqt "${APPBUNDLE}" -verbose=2 + + phase "Creating DMG" + ${PKG_DMG} \ + --source "${APPBUNDLE}" \ + --sourcefile \ + --target "${DMGFILE}" \ + --volname "x2goclient" \ + --verbosity 2 \ + --mkdir "/.background" \ + --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ + --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/LICENSE" \ + --copy "${TOP_DIR}/COPYING" \ + --symlink "/Applications: " \ + --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ + --format "UDBZ" +fi popd -- Alioth's /srv/git/code.x2go.org/x2goclient.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 ab0592f66383a5db5261c33919461e73fe64c2a4 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 04:11:58 2015 +0100 general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files: - appdialog.cpp - cupsprintersettingsdialog.cpp - onmainwindow.cpp - sessionmanagedialog.cpp - sshmasterconnection.cpp - xsettingswidget.cpp --- debian/changelog | 1 + src/appdialog.cpp | 2 ++ src/cupsprintersettingsdialog.cpp | 7 ++++--- src/onmainwindow.cpp | 10 ++++++++-- src/sessionmanagedialog.cpp | 4 ++-- src/sshmasterconnection.cpp | 2 +- src/x2goutils.h | 5 ++++- src/xsettingswidget.cpp | 2 ++ 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8be0098..4c80fa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -239,6 +239,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium environment variable in macbuild.sh. - Enable -O2 in debug mode. Otherwise, debug mode would test different execution paths than release mode. + - Add new UNUSED() macro to x2goutils.h and silence compiler warnings. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/appdialog.cpp b/src/appdialog.cpp index 0d2a5f6..f10be8f 100644 --- a/src/appdialog.cpp +++ b/src/appdialog.cpp @@ -152,6 +152,8 @@ void AppDialog::loadApps() other=initTopItem(tr("Other"), QPixmap(":/img/icons/22x22/applications-other.png")); parent=other; break; + default: + break; } QTreeWidgetItem* it; diff --git a/src/cupsprintersettingsdialog.cpp b/src/cupsprintersettingsdialog.cpp index f54bd68..d3a4f13 100644 --- a/src/cupsprintersettingsdialog.cpp +++ b/src/cupsprintersettingsdialog.cpp @@ -17,6 +17,7 @@ #include "cupsprintersettingsdialog.h" #include "cupsprint.h" +#include "x2goutils.h" #ifndef Q_OS_WIN #include <QHeaderView> #include <QMessageBox> @@ -206,9 +207,9 @@ void CUPSPrinterSettingsDialog::setPPDTab() CUPSPrint::printState state; QString stateReason; QString valueName,valueText; - !m_cups->getPrinterInfo ( printer, - info,acceptJobs, - location,model,state,stateReason ) ; + UNUSED (m_cups->getPrinterInfo (printer, + info, acceptJobs, + location, model, state, stateReason)); ui.ppdTree->clear(); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index f571f89..277e18c 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10713,7 +10713,10 @@ void ONMainWindow::slotChangeKbdLayout(const QString& layout) x2goDebug<<"Running setxkbmap with params: "<<args.join(" "); QProcess::startDetached("setxkbmap",args); -#endif +#else + /* Silence warning. */ + UNUSED (layout); +#endif /* defined (Q_OS_LINUX) */ } void ONMainWindow::initPassDlg() @@ -11446,7 +11449,10 @@ void ONMainWindow::slotPCookieReady ( bool result, #ifdef Q_OS_WIN if ( result ) slotStartParec(); -#endif +#else + /* Silence warning. */ + UNUSED (result); +#endif /* defined (Q_OS_WIN) */ } diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp index 49016bf..c88f0f2 100644 --- a/src/sessionmanagedialog.cpp +++ b/src/sessionmanagedialog.cpp @@ -134,8 +134,8 @@ void SessionManageDialog::loadSessions() { sessions->clear(); - const QList<SessionButton*> *sess=par->getSessionExplorer()->getSessionsList(); - const QList<FolderButton*> *folders=par->getSessionExplorer()->getFoldersList(); + /*const QList<SessionButton*> *sess=par->getSessionExplorer()->getSessionsList();*/ + /*const QList<FolderButton*> *folders=par->getSessionExplorer()->getFoldersList();*/ removeSession->setEnabled ( false ); editSession->setEnabled ( false ); diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index c8669a5..2449cf5 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -304,7 +304,7 @@ void SshMasterConnection::checkReverseTunnelConnections() for(int i=0; i<reverseTunnelRequest.count(); ++i) { ReverseTunnelRequest req=reverseTunnelRequest[i]; - if(req.forwardPort==port) + if (static_cast<int> (req.forwardPort) == port) { #ifdef DEBUG x2goDebug<<"Creating new channel for reverse tunnel "<<port; diff --git a/src/x2goutils.h b/src/x2goutils.h index 912ce2d..21365da 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -21,8 +21,11 @@ #include <QString> +#define UNUSED(x) do { (void) x; } while (0) + QString expandHome( QString path ); QString fixup_resource_URIs (const QString res_path); QString wrap_legacy_resource_URIs (const QString res_path); -#endif + +#endif /* !defined (X2GOUTILS_H) */ diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp index 3ea0c52..842dca3 100644 --- a/src/xsettingswidget.cpp +++ b/src/xsettingswidget.cpp @@ -17,10 +17,12 @@ #include "xsettingswidget.h" #include "x2gosettings.h" +#include "x2goutils.h" #include <QFileDialog> XSettingsWidget::XSettingsWidget(QWidget* parent) { + UNUSED (parent); setupUi(this); X2goSettings st ( "settings" ); -- Alioth's /srv/git/code.x2go.org/x2goclient.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 8ebbd350c10d9693e8ee0c20d24d4cebc6a51d43 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 04:14:58 2015 +0100 onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing... --- debian/changelog | 2 ++ src/onmainwindow.cpp | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c80fa6..afa00db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -240,6 +240,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Enable -O2 in debug mode. Otherwise, debug mode would test different execution paths than release mode. - Add new UNUSED() macro to x2goutils.h and silence compiler warnings. + - Fix some QMessageBox usages. There are many more places that need + fixing... -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 277e18c..3e41db8 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -2883,8 +2883,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa "Somebody might be eavesdropping on you.\n" "For security reasons, it is recommended to stop the connection.\n" "Do you want to terminate the connection?\n" ); - if ( !QMessageBox::warning( 0, tr( "Host key verification failed" ), - errMsg, tr( "Yes" ), tr( "No" ) ) != 0) + if (QMessageBox::warning (0, tr ("Host key verification failed"), + errMsg, QMessageBox::Yes | QMessageBox::No, + QMessageBox::No) == QMessageBox::Yes) { connection->writeKnownHosts(false); connection->wait(); @@ -2910,8 +2911,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa "confuse your client into thinking the key does not exist. \n" "For security reasons, it is recommended to stop the connection.\n" "Do you want to terminate the connection?\n"); - if ( !QMessageBox::warning( 0, tr( "Host key verification failed" ), - errMsg, tr( "Yes" ), tr( "No" ) ) != 0) + if (QMessageBox::warning (0, tr ("Host key verification failed"), + errMsg, QMessageBox::Yes | QMessageBox::No, + QMessageBox::No) == QMessageBox::Yes) { connection->writeKnownHosts(false); connection->wait(); @@ -2952,7 +2954,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa break; } - if ( QMessageBox::warning ( this, tr ( "Host key verification failed" ),errMsg,tr ( "Yes" ), tr ( "No" ) ) !=0 ) + if (QMessageBox::warning (this, tr ("Host key verification failed"), + errMsg, QMessageBox::Yes | QMessageBox::No, + QMessageBox::No) == QMessageBox::No) { connection->writeKnownHosts(false); connection->wait(); @@ -2994,9 +2998,9 @@ void ONMainWindow::slotSshUserAuthError ( QString error ) trayQuit(); } - QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error, - QMessageBox::Ok, - QMessageBox::NoButton ); + QMessageBox::critical (0l, tr ("Authentication failed"), + error, QMessageBox::Ok, + QMessageBox::NoButton); setEnabled ( true ); passForm->setEnabled ( true ); slotShowPassForm(); -- Alioth's /srv/git/code.x2go.org/x2goclient.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 96e48e01f9b6b346cf73a5e42aac56539647a96a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 05:22:35 2015 +0100 ssh{masterconnection,process}.cpp: add more debugging messages to trace mutex lock and unlock and command execution via SSH. --- src/sshmasterconnection.cpp | 3 +++ src/sshprocess.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 2449cf5..e9a7008 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1242,8 +1242,11 @@ void SshMasterConnection::addChannelConnection ( SshProcess* creator, QString uu con.command=cmd; con.uuid=uuid; + x2goDebug << "locking SSH channel connection MUTEX."; channelConnectionsMutex.lock(); + x2goDebug << "passing con to channelConnections."; channelConnections<<con; + x2goDebug << "unlocking SSH channel connection MUTEX."; channelConnectionsMutex.unlock(); } diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp index 50bd7ae..3c43496 100644 --- a/src/sshprocess.cpp +++ b/src/sshprocess.cpp @@ -191,6 +191,7 @@ void SshProcess::startNormal(const QString& cmd) if(!masterCon->useKerberos()) { QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'"; + x2goDebug << "running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');"; masterCon->addChannelConnection(this, uuidStr, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); connect(masterCon,SIGNAL(channelClosed(SshProcess*,QString)), this,SLOT(slotChannelClosed(SshProcess*,QString))); -- Alioth's /srv/git/code.x2go.org/x2goclient.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 dbb398c91ea90079dda1103b24780331e1859ba2 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 02:46:02 2015 +0100 macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 567fa1b..94e9f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -244,6 +244,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium fixing... - Remove config_mac.sh. macbuild.sh handles this now. - Use the correct client build dir in macbuild.sh: client_build. + - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 9263d26..35bdb48 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -30,7 +30,7 @@ SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK} MATCH_NUMBERS='^[0-9]+$' if [[ "${SDK_MINOR_VERSION}" =~ ${MATCH_NUMBERS} ]]; then - STDLIB="libstdc++" + [ "${SDK_MINOR_VERSION}" -gt "6" ] && STDLIB="libstdc++" [ "${SDK_MINOR_VERSION}" -gt "8" ] && STDLIB="libc++" else echo "Unable to determine OS X version. Unknown value '${SDK_MINOR_VERSION}'." >&2 -- Alioth's /srv/git/code.x2go.org/x2goclient.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 782a0ad71a0f966bf70f5d99e3964626c4b27912 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:06:21 2015 +0100 macbuild.sh: use sh default assignment instead of default value. Removes the need to redundantly specify the variable name. --- debian/changelog | 2 ++ macbuild.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 94e9f9f..ee299dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -245,6 +245,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Remove config_mac.sh. macbuild.sh handles this now. - Use the correct client build dir in macbuild.sh: client_build. - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. + - Use sh default assignment instead of default value in macbuild.sh. + Removes the need to redundantly specify the variable name. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 35bdb48..aedcabe 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -11,10 +11,10 @@ PKG_DMG="${TOP_DIR}/pkg-dmg" NXPROXY="$(which nxproxy)" -SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" -MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" -DEBUG="${DEBUG:-"0"}" -BUNDLE="${BUNDLE:-"1"}" +: ${SDK:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"} +: ${MACOSX_DEPLOYMENT_TARGET:="10.7"} +: ${DEBUG:="0"} +: ${BUNDLE:="1"} case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; -- Alioth's /srv/git/code.x2go.org/x2goclient.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 ab07861c894cbc5e797186c69fec5ce06e4fc9ae Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:16:09 2015 +0100 macbuild.sh: Remove 'function' keyword, as it's causing undefined behavior according to SUS. --- debian/changelog | 2 ++ macbuild.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 87b2515..b65d53e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -249,6 +249,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium Removes the need to redundantly specify the variable name. - App bundle and dmg file will be automatically removed when removing the client build directory. Remove redundancy from macbuild.sh. + - Remove 'function' keyword in macbuild.sh, as it's causing undefined + behavior according to SUS. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index 27e4988..9e6ba76 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -39,7 +39,7 @@ fi set -e -function phase() { +phase() { echo echo "***" echo "*** ${1}..." -- Alioth's /srv/git/code.x2go.org/x2goclient.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 37cc1a9cd654b68dbad17e3ea1f9c8ffc3196322 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:27:19 2015 +0100 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. Switches the build architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). --- debian/changelog | 3 +++ macbuild.sh | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ccf0e3e..fca4fa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -254,6 +254,9 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Define and implement new function 'make_boolean()' in macbuild.sh. Takes a pseudo-boolean value and outputs either 0 or 1. Use this function. - Move functions to the start of the macbuild.sh script. + - New env var/parameter UNIVERSAL in macbuild.sh. Switches the build + architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 + and x86 (UNIVERSAL=1). -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index bd35460..e25caf5 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,12 +35,17 @@ NXPROXY="$(which nxproxy)" : ${MACOSX_DEPLOYMENT_TARGET:="10.7"} : ${DEBUG:="0"} : ${BUNDLE:="1"} +: ${UNIVERSAL:="1"} DEBUG="$(make_boolean "${DEBUG}")" BUNDLE="$(make_boolean "${BUNDLE}")" +UNIVERSAL="$(make_boolean "${UNIVERSAL}")" [ "${DEBUG}" -eq "0" ] && BUILD_MODE="release" || BUILD_MODE="debug" +BUILD_ARCH="x86_64" +[ "${UNIVERSAL}" -eq "1" ] && BUILD_ARCH="${BUILD_ARCH} x86" + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -67,7 +72,7 @@ lrelease "${PROJECT}" phase "Running qmake" qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ - CONFIG+="x86_64" \ + CONFIG+="${BUILD_ARCH}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ OSX_STDLIB="${STDLIB}" -- Alioth's /srv/git/code.x2go.org/x2goclient.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 73af76eee812cbe895c435027c23ff554565a639 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 04:40:00 2015 +0100 macbuild.sh: add usage message obtainable via -h or --help. --- debian/changelog | 1 + macbuild.sh | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index fca4fa1..f17a690 100644 --- a/debian/changelog +++ b/debian/changelog @@ -257,6 +257,7 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - New env var/parameter UNIVERSAL in macbuild.sh. Switches the build architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). + - Add usage message to macbuild.sh obtainable via -h or --help. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index e25caf5..5e68928 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -19,6 +19,28 @@ phase() { echo } +usage() { + exec >&2 + + NO_VAL="0, no, NO, No, nO, false or FALSE" + printf "$(basename ${0}): usage\n\n" + printf "Accepted environment variables:\n" + printf "\tSDK:\t\t\t\tsets the target SDK [string]\n\t\t\t\t\tdefault: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk\n" + printf "\tMACOSX_DEPLOYMENT_TARGET:\tsets the deployment target (specific OS X version to optimize/build for) [string]\n\t\t\t\t\tdefault: 10.7\n" + printf "\tDEBUG\t\t\t\tenables or disables debug builds [boolean]\n\t\t\t\t\tdefault: disabled\n" + printf "\tBUNDLE\t\t\t\tenables or disables library bundling and the creation of a .dmg installer [boolean]\n\t\t\t\t\tdefault: enabled\n" + printf "\tUNIVERSAL\t\t\tenables or disables x86 support. x86_64 support is always enabled [boolean]\n\t\t\t\t\tdefault: enabled\n" + printf "\n" + printf "Boolean values help:\n" + printf "\ta value of ${NO_VAL} will be treated as false\n" + printf "\tany other value will be treated as true\n" + + exit 2 +} + +MATCH_HELP='(^((-h)|(--help))([ ]|$))|([ ]+((-h)|(--help))([ ]|$))' +[ -n "${*}" ] && [[ "${*}" =~ ${MATCH_HELP} ]] && usage + NAME="x2goclient" TOP_DIR="$(dirname "$0")" -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git