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