Mercurial > hg > forks > UniversalIndentGUI
changeset 417:e34812990435
Commented the preparations for the animated about dialog out.
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@649 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Thu, 27 Mar 2008 20:58:23 +0000 |
| parents | 876953cb382e |
| children | 8557d9833a2f |
| files | UniversalIndentGUI.pro src/mainwindow.cpp src/mainwindow.h |
| diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/UniversalIndentGUI.pro Wed Mar 26 15:24:53 2008 +0000 +++ b/UniversalIndentGUI.pro Thu Mar 27 20:58:23 2008 +0000 @@ -31,8 +31,10 @@ lupdate = lupdate unix:lupdate = lupdate-qt4 +macx:lupdate = lupdate lrelease = lrelease unix:lrelease = lrelease-qt4 +macx:lrelease = lrelease # Update translation files system($${lupdate} src -ts ./translations/universalindent.ts -silent) system($${lupdate} src -ts ./translations/universalindent_de.ts -silent) @@ -171,6 +173,10 @@ src/uiguisettings.cpp \ src/uiguisettingsdialog.cpp \ src/updatecheckdialog.cpp +#macx { +#SOURCES += src/AboutDialogGraphicsView.cpp +#HEADERS += src/AboutDialogGraphicsView.h +#} RESOURCES += resources/Icons.qrc RC_FILE = resources/programicon.rc
--- a/src/mainwindow.cpp Wed Mar 26 15:24:53 2008 +0000 +++ b/src/mainwindow.cpp Thu Mar 27 20:58:23 2008 +0000 @@ -136,16 +136,16 @@ // generate about dialog box -#if QT_VERSION >= 0x040400 +/*#if QT_VERSION >= 0x040400 aboutDialog = new AboutDialog(this, Qt::SplashScreen, version, revision, buildDateStr); aboutDialogGraphicsView = new AboutDialogGraphicsView(aboutDialog, this); connect( toolBarWidget->pbAbout, SIGNAL(clicked()), aboutDialogGraphicsView, SLOT(show()) ); connect( actionAbout_UniversalIndentGUI, SIGNAL(activated()), aboutDialogGraphicsView, SLOT(show()) ); -#else +#else */ aboutDialog = new AboutDialog(this, Qt::Dialog, version, revision, buildDateStr); connect( actionAbout_UniversalIndentGUI, SIGNAL(activated()), aboutDialog, SLOT(exec()) ); connect( toolBarWidget->pbAbout, SIGNAL(clicked()), aboutDialog, SLOT(exec()) ); -#endif +//#endif // generate settings dialog box settingsDialog = new UiGuiSettingsDialog(this, settings);
--- a/src/mainwindow.h Wed Mar 26 15:24:53 2008 +0000 +++ b/src/mainwindow.h Thu Mar 27 20:58:23 2008 +0000 @@ -24,7 +24,7 @@ #include "ui_toolBarWidget.h" #include "aboutdialog.h" #if QT_VERSION >= 0x040400 -#include "AboutDialogGraphicsView.h" +//#include "AboutDialogGraphicsView.h" #endif #include "uiguisettings.h" #include "uiguisettingsdialog.h" @@ -96,7 +96,7 @@ QScrollBar *textEditVScrollBar; AboutDialog *aboutDialog; #if QT_VERSION >= 0x040400 - AboutDialogGraphicsView *aboutDialogGraphicsView; + //AboutDialogGraphicsView *aboutDialogGraphicsView; #endif UiGuiSettingsDialog *settingsDialog; int textEditLastScrollPos;