This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 145eb68f4884e9a43b9576ceddb45b4ebab1ef39 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 00:14:34 2015 +0100 Move png/ to img/png/ and update references in: - resources.rcc and - src/onmainwindow.cpp --- debian/changelog | 2 ++ {png => img/png}/ico.png | Bin 3437 -> 3437 bytes {png => img/png}/ico_440x180.png | Bin 1331 -> 1331 bytes {png => img/png}/ico_mini.png | Bin 753 -> 753 bytes {png => img/png}/macinstaller_background.png | Bin 59943 -> 59943 bytes {png => img/png}/power-button.png | Bin 762 -> 762 bytes {png => img/png}/sess_ico.png | Bin 1161 -> 1161 bytes resources.rcc | 10 +++++----- src/onmainwindow.cpp | 6 +++--- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d4a20a..f918661 100644 --- a/debian/changelog +++ b/debian/changelog @@ -150,6 +150,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium 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 png/ to img/png/ and update references in resources.rcc and + src/onmainwindow.cpp. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/png/ico.png b/img/png/ico.png similarity index 100% rename from png/ico.png rename to img/png/ico.png diff --git a/png/ico_440x180.png b/img/png/ico_440x180.png similarity index 100% rename from png/ico_440x180.png rename to img/png/ico_440x180.png diff --git a/png/ico_mini.png b/img/png/ico_mini.png similarity index 100% rename from png/ico_mini.png rename to img/png/ico_mini.png diff --git a/png/macinstaller_background.png b/img/png/macinstaller_background.png similarity index 100% rename from png/macinstaller_background.png rename to img/png/macinstaller_background.png diff --git a/png/power-button.png b/img/png/power-button.png similarity index 100% rename from png/power-button.png rename to img/png/power-button.png diff --git a/png/sess_ico.png b/img/png/sess_ico.png similarity index 100% rename from png/sess_ico.png rename to img/png/sess_ico.png diff --git a/resources.rcc b/resources.rcc index 048cf2e..04a5a53 100644 --- a/resources.rcc +++ b/resources.rcc @@ -10,11 +10,11 @@ <file>svg/folder.svg</file> <file>svg/folder_grey.svg</file> <file>svg/sessionbut_grey.svg</file> - <file>png/ico.png</file> - <file>png/ico_mini.png</file> - <file>png/sess_ico.png</file> - <file>png/ico_440x180.png</file> - <file>png/power-button.png</file> + <file>img/png/ico.png</file> + <file>img/png/ico_mini.png</file> + <file>img/png/sess_ico.png</file> + <file>img/png/ico_440x180.png</file> + <file>img/png/power-button.png</file> <file>img/icons/128x128/x2go.png</file> <file>img/icons/128x128/folder.png</file> <file>img/icons/128x128/x2gosession.png</file> diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index ee08fb6..9ca1480 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -463,7 +463,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) if (showHaltBtn) { QPushButton* bHalt=new QPushButton(bgFrame); - QPixmap p(":/png/power-button.png"); + QPixmap p(":/img/png/power-button.png"); bHalt->setIcon(p); bHalt->setFocusPolicy(Qt::NoFocus); bHalt->setFixedSize(32,32); @@ -1592,9 +1592,9 @@ void ONMainWindow::displayUsers() QPixmap pix; if ( !miniMode ) - pix=QPixmap ( ":/png/ico.png" ); + pix=QPixmap ( ":/img/png/ico.png" ); else - pix=QPixmap ( ":/png/ico_mini.png" ); + pix=QPixmap ( ":/img/png/ico_mini.png" ); QPixmap foto=QPixmap ( iconsPath ( "/64x64/personal.png" ) ); QPalette pal=palette(); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git