From fc8a26841c04c1a6498b98bffa45c1c2b4c57367 Mon Sep 17 00:00:00 2001 From: spacy51 Date: Thu, 21 Feb 2008 17:33:04 +0000 Subject: [PATCH] Qt: - Eye candy - Code cleanup --- project/vc2008/vba-m.vcproj | 2 +- src/qt/MainWnd.cpp | 28 ++++++++++++---------------- src/qt/MainWnd.h | 4 +--- src/qt/configdialog.cpp | 1 + src/qt/main.cpp | 2 +- src/qt/resources/exit.png | Bin 0 -> 842 bytes src/qt/resources/gl.png | Bin 0 -> 599 bytes src/qt/resources/locale.png | Bin 0 -> 750 bytes src/qt/resources/open.png | Bin 0 -> 419 bytes src/qt/resources/qt_logo.png | Bin 0 -> 451 bytes src/qt/resources/settings.png | Bin 0 -> 874 bytes src/qt/resources/vba-m.png | Bin 0 -> 604 bytes src/qt/vba-m.qrc | 17 ++++++++++++----- 13 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 src/qt/resources/exit.png create mode 100644 src/qt/resources/gl.png create mode 100644 src/qt/resources/locale.png create mode 100644 src/qt/resources/open.png create mode 100644 src/qt/resources/qt_logo.png create mode 100644 src/qt/resources/settings.png create mode 100644 src/qt/resources/vba-m.png diff --git a/project/vc2008/vba-m.vcproj b/project/vc2008/vba-m.vcproj index 57bd670e..ff85b26b 100644 --- a/project/vc2008/vba-m.vcproj +++ b/project/vc2008/vba-m.vcproj @@ -143,11 +143,11 @@ diff --git a/src/qt/MainWnd.cpp b/src/qt/MainWnd.cpp index 3eccc3ca..7221ad0f 100644 --- a/src/qt/MainWnd.cpp +++ b/src/qt/MainWnd.cpp @@ -23,9 +23,8 @@ #include "sidewidget_cheats.h" -MainWnd::MainWnd( QWidget *parent, QApplication *app, QTranslator **trans ) +MainWnd::MainWnd( QWidget *parent, QTranslator **trans ) : QMainWindow( parent ), - theApp( app ), translator( trans ), fileMenu( 0 ), settingsMenu( 0 ), @@ -96,14 +95,14 @@ void MainWnd::createMenus() // File menu fileMenu = menuBar()->addMenu( tr( "&File" ) ); - fileMenu->addAction( tr( "Open ROM" ), this, SLOT( showOpenROM() ) ); - fileMenu->addAction( tr( "Exit" ), this, SLOT( close() ) ); + fileMenu->addAction( QIcon( ":/resources/open.png" ), tr( "Open ROM" ), this, SLOT( showOpenROM() ) ); + fileMenu->addAction( QIcon( ":/resources/exit.png" ), tr( "Exit" ), this, SLOT( close() ) ); // Settings menu settingsMenu = menuBar()->addMenu( tr( "&Settings" ) ); - settingsMenu->addAction( tr( "Main options..." ), this, SLOT( showMainOptions() ) ); - settingsMenu->addAction( tr( "Select language..." ), this, SLOT( selectLanguage() ) ); + settingsMenu->addAction( QIcon( ":/resources/settings.png" ), tr( "Main options..." ), this, SLOT( showMainOptions() ) ); + settingsMenu->addAction( QIcon( ":/resources/locale.png" ), tr( "Select language..." ), this, SLOT( selectLanguage() ) ); settingsMenu->addAction( enableTranslationAct ); @@ -117,9 +116,9 @@ void MainWnd::createMenus() // Help menu helpMenu = menuBar()->addMenu( tr( "&Help" ) ); - helpMenu->addAction( tr( "About &VBA-M..." ), this, SLOT( showAbout() ) ); - helpMenu->addAction( tr( "About &OpenGL..." ), this, SLOT( showAboutOpenGL() ) ); - helpMenu->addAction( tr( "About &Qt..." ), this, SLOT( showAboutQt() ) ); + helpMenu->addAction( QIcon( ":/resources/vba-m.png" ), tr( "About &VBA-M..." ), this, SLOT( showAbout() ) ); + helpMenu->addAction( QIcon( ":/resources/gl.png" ), tr( "About &OpenGL..." ), this, SLOT( showAboutOpenGL() ) ); + helpMenu->addAction( QIcon( ":/resources/qt_logo.png" ), tr( "About &Qt..." ), qApp, SLOT( aboutQt() ) ); } @@ -199,14 +198,14 @@ bool MainWnd::enableTranslation( bool enable ) { if( enable ) { if( *translator != 0 ) { - theApp->installTranslator( *translator ); + qApp->installTranslator( *translator ); enableTranslationAct->setChecked( true ); } else { return false; } } else { if( *translator != 0 ) { - theApp->removeTranslator( *translator ); + qApp->removeTranslator( *translator ); } else { return false; } @@ -233,11 +232,6 @@ void MainWnd::showAbout() } -void MainWnd::showAboutQt() -{ - QMessageBox::aboutQt( this ); -} - void MainWnd::showOpenROM() { QString info; @@ -246,6 +240,7 @@ void MainWnd::showOpenROM() QMessageBox::about( this, tr( "Status" ), info ); } + void MainWnd::showMainOptions() { ConfigDialog dialog; @@ -287,5 +282,6 @@ void MainWnd::showAboutOpenGL() } QMessageBox *test = new QMessageBox( QMessageBox::NoIcon, tr( "About OpenGL" ), info, QMessageBox::NoButton, this ); + test->setWindowIcon( QIcon( ":/resources/gl.png" ) ); test->show(); } diff --git a/src/qt/MainWnd.h b/src/qt/MainWnd.h index ab8c3f48..70200b8a 100644 --- a/src/qt/MainWnd.h +++ b/src/qt/MainWnd.h @@ -26,7 +26,7 @@ class MainWnd : public QMainWindow Q_OBJECT public: - MainWnd( QWidget *parent = 0, QApplication *app = 0, QTranslator **trans = 0 ); + MainWnd( QWidget *parent = 0, QTranslator **trans = 0 ); ~MainWnd(); public slots: @@ -38,7 +38,6 @@ private: void createDockWidgets(); bool createDisplay(); - QApplication *theApp; QTranslator **translator; QMenu *fileMenu; QMenu *settingsMenu; @@ -52,7 +51,6 @@ private slots: bool enableTranslation( bool enable ); void showAbout(); void showAboutOpenGL(); - void showAboutQt(); void showOpenROM(); void showMainOptions(); }; diff --git a/src/qt/configdialog.cpp b/src/qt/configdialog.cpp index e43bb351..d009b28f 100644 --- a/src/qt/configdialog.cpp +++ b/src/qt/configdialog.cpp @@ -60,6 +60,7 @@ ConfigDialog::ConfigDialog() setWindowTitle(tr("Options")); + setWindowIcon( QIcon( ":/resources/settings.png" ) ); } void ConfigDialog::createIcons() diff --git a/src/qt/main.cpp b/src/qt/main.cpp index c3f2d03f..ae150cf5 100644 --- a/src/qt/main.cpp +++ b/src/qt/main.cpp @@ -25,7 +25,7 @@ int main( int argc, char *argv[] ) QApplication theApp( argc, argv ); QTranslator *translator = 0; - MainWnd *mainWnd = new MainWnd( 0, &theApp, &translator ); + MainWnd *mainWnd = new MainWnd( 0, &translator ); mainWnd->show(); return theApp.exec(); diff --git a/src/qt/resources/exit.png b/src/qt/resources/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..4839c614294e7f16637751bdfd0b80064641a574 GIT binary patch literal 842 zcmV-Q1GW5#P)0b000McNliru*9;pL3I!7>cy9mz0@q1I zK~#9!jgrr6R96(oKli>jZ(e3Hlc^*fCy5YsTr{;m)T)1h3l$fk=qk`fZ5M$q+LgOX zc3l+&L5ntBbdh4|9}tLcT!^5k*piTRh#`}xGchyc%gnrA_j!19A<~5h4(Go6?)P)Q z=WtbPe*S3h?%kWMg@t_p$y*6vfOq$uy?gD-^tAVCW#x>jU%GTJJaFJ-S1H~%5~a|s z7B8<~yQ3Dg-qo;zUHAS2oAj-K^&YfehSR@X^^o+N*MkIg`u%nEf zIzWWa@82if_1ORQMcjOz(eoGNHiMJPVMJV;yGiru-+&@p8cG4yR5tTN;AD%j0F;R_ z%{uW$jr?cFFj|AQ&|-P#k6-CLc}TC>q`khu`r;yfzyI2fEQ|Kz$CxChSac}uaq0E9 zQD?qnu=D|ufOlSPv$^mW$?`vVUGVyv*mem49orU(0_lXT4p95XnYes~((nit1}iaS z2Mc`o<5e<~hmn!sW)-%rNdd-I3axN#a1VdV$5-bW85_sZkh?y^(A;;jRtyPn;-}xp zesToI0V|{abCA&}4MlkaU)=bUkx>y_!o2bg?(%I4|K4Hv_wOm@a}1A;@%gn|6sm`? z1rVhUgbv_08aS;67BaBeukar(k^m-w_|a|5&)+iOWXQCdgxd|21qM(zj#i)dYV~qX z$8y6EmB}h@x(D+F4fp+wCOtqmTKE|+b!>3H$hZZ-3~ny^I~n+a07*qoM6N<$g1mZ)LjV8( literal 0 HcmV?d00001 diff --git a/src/qt/resources/gl.png b/src/qt/resources/gl.png new file mode 100644 index 0000000000000000000000000000000000000000..f20e0f4e6792d833cc581d9920b40df3c0d2b52a GIT binary patch literal 599 zcmV-d0;v6oP)Px%5lKWrR5;7kkxNUIQ5?pf|2glx7sX5+@CHgHbj21LQ7vi_N#IUsk*iwy1^Nmt zqE>zYsnC@z3dlxz4J@Z#AAdhTw*=TdfCK;x4qiw2a|YQD z{bDm~Sc+o^n#ZJ+!NB^bms=-B4}hyv;_JfB4{e`wT#xqv4z5miL*?#Zd0|Vge7xz! z(F@g;YqG;54-H}Bdyt#~tbw%vQ^MAwhKdeMWdypuUly|WeXAeTcqfNK27YSyf>!k* zS5@L#tb7OyVKqDm-u)9mHX2|ZgCeyiG#4>Gm4wOPR>ri!go$eUQ4WX{EW=8HUAPSi z1eCIH18~c}mL`OZ(z_&mdDTh9)c{fLqEOXy!qv?n5Lrt=*zkf7f}X+gVGa*p3cHUc z@nrII+hTegO&#|DNCF8MDJ{Y+wrC-k_^z4jp}?Nu?$7ODv;ko`~C7hbK`lpQc>qh_jTMwau-*+{`Z8 zj$Vb*`YF^(F1Cw3s22NC*%+XWwZiW~x&XKAwjWB^xHp81TJ`p-MiBW30}pY&1aVLR lK2d@g#DWc^<5lqg>ld9|{8xP0BJ}_O002ovPDHLkV1j7o2}}S0 literal 0 HcmV?d00001 diff --git a/src/qt/resources/locale.png b/src/qt/resources/locale.png new file mode 100644 index 0000000000000000000000000000000000000000..b8abf7c735fc2cca843b8c00415d27d80a90ac68 GIT binary patch literal 750 zcmVgB<9;i`f=ZR7631ho2dU_FK^Mdfv1ULK~ zC!XNP#OZJJ&kgNb=oU3q_bEQ@bN=*a%Gq<`JtbYSlJ_+;p(Nqr?eIm!YCU<&Y7!}2qM@JIBQ$7bCg9vJs4nnJ&qne z!~kBEkPElO_{+_2a1Li>F13*RfodFu40K$K(z#3Qq gTm2ud=DM8!1?g@W&U!x)?f?J)07*qoM6N<$f(pf382|tP literal 0 HcmV?d00001 diff --git a/src/qt/resources/open.png b/src/qt/resources/open.png new file mode 100644 index 0000000000000000000000000000000000000000..1d2f3012e48fae8de244b732d15746548d10330a GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4VgjTcucTd!;*OTqt!2p7sp)R5Wvpd%tl@}u6j&2`kp04s z?XA1Iqyny-ePT7)7&*#Ex%Dy(b9FRCrSlnlk>#6)xzgjGvdD}sSZ~k$=%mtQ* zsOSp>iCR}Af45R#RD0E9)I7oWRo=V1Dl7IiZ8-1Z-D|kPZRNZh9Jd}yYeqLzoxQav z#&My5(ea%!8=THwPtet1&TcBU{GhSzpx|ef>NtxoApEwqTW;fZZPT zYqk$w{M;yN`*qp-UBTQ8qB71tSN7V9KDzckHSJfpR?Cx@e;6KeM>Km?op}xnPzFy| KKbLh*2~7Yrzo}aQ literal 0 HcmV?d00001 diff --git a/src/qt/resources/qt_logo.png b/src/qt/resources/qt_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..99b8c97e6b709b9433c2f1d28a1744b89e339dee GIT binary patch literal 451 zcmV;!0X+VRP)Px$eMv+?R4C75Tzb}$ffT^RKq6p4<3GLs{m|xDcP@WnU|>+u<+1Y>lUC$JR=@~% z(%(P-m-Ic@z52!fe@N0y46dOPF+~c@ER5(jEbV`=Yvl_z4kq6OX)R+u1_p*}XFqLT z@O0P87mSPyaixkVet3HS`>s_l*f^M~rfUVI%4itzNhxy5t8!IM*J9&f+O_J%)BE31 zG#uXY`u{%$-vnt@JzfR|hEMN*x29j4P7zyPs|k&%Ick)d;y0VG18PLfvS zbPJRC_2XY#=Cy~nzdgJE{n`ER1~!6>j12$(GjQ{=@CvXH8*$vcEMGqUv2YX4ZC69l tfGcV63a~8fx*uPr$S25(MFaIyD*#)+t-Tn01L6Px002ovPDHLkV1hi0*v6SW2UXoB(ijskm7m_3- zVjoJPw2LC?L{tLtOAZvAmZG?6(U*aR&N;8I>$W-Bmiv&Xx#l*yd@$Wb+iY!fZ?DE+ zh*&>(Zs$Db|D40~Jb+;sJZ^1`+8h7XL?Y3($;ru4m0DHkvjK{t-Bzm=8FIo}Lp~nVF}RN+sC0ZD6%o;iuhBd@q;JEG;dq z@0Z{Yo(bXhopLFc%gr|#4fRf^vvtj|7UXezc5OD>j$_C1L#NY;X3^PZ3?~2%fZM#d zNHH@$PI|exm_H_w0EtBMh{a-#Mxznq{$22c0EfWi@iGz;n1usE0pu4HLQ#g<+>o<) z))#!FKzn<8UJN}(JuoOFhJ}S=#L*|kpg@^|4Mjxm`o@T5E4%% zgVAX0Q7g1Vs;ONMIn9e)yh~mf;RcAn55Jezb)$pd;myv;!tguCDk>^o`Fzn45HIfx zbh^HCv!FAsu-_4j&G~;@t zQy9F?tu4sEMN8Gb1O2)T2}Dp7C7VnpxmvAOkjdoxp`oEG&CShexVj4tP+ovM;NBxV zjR+Px%7D+@wR5;7sk~>dRVH}5l|M$FadoJy1&pCx~2{$za0|SF5c45+mO$~{`!QHRm zw_tG7iRhq9(MGQ~*787ajfcpfUFROsn8H~TwXDfjQ)ol~^6b-bFyYAx_H@2u&g)jCDk zuOqo^Axtxb%z_XWOtT2naNs%>xRpFii%E^+IX~P#dwhIy<}uPBdlKt!-yn%5uf?gq zxjDUoCo3zk904uO+mjRCBYx5K=bUm8nTpXom52&=P%1uzsb4~O1H{B3GeTE7h+3Zz zMtzjBF;s?ZTy!sQ^EAnZicSc|6uPpFbX13TBgW#`4#Yx)BRLI989McGs7(X9p-^@S zor^kjVGncD%oTst1_**aR0brY3SaLpV!Ja0b<_cfK;AfL-ho+HXf)0dM;s;FMWt-n zTyQ;aS~fs=7-k)*5g=R)0C<1AB0%n21ba}x(oz)%`#+&+f^!htE!pJ-jrlN)0t)Y6 z!Tb0QGc(iZ$sVFO0%Hv4?KaX>!Fu`vJsAR|BT2RI^m6UPuv5OZJn+K@jM#Fcc~Cy7 z?V;Un!Vd-j07JLnx+9pHn#b74Y?m=?7`pg;c(l1e*I%{%dd~pyD(7mJNO?&d6%hmxF0000 - - resources/video.png - resources/input.png - resources/sound.png - + + resources/video.png + resources/input.png + resources/sound.png + resources/exit.png + resources/locale.png + resources/settings.png + resources/open.png + resources/qt_logo.png + resources/gl.png + resources/vba-m.png +