From a57b51348a0056a552568e0b70db51463f322f9c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 9 Feb 2023 22:17:59 +0900 Subject: First part of About dialog. Signed-off-by: Michele Calgaro --- icons/CMakeLists.txt | 1 + icons/__TODO/banner.png | Bin 142927 -> 0 bytes icons/banner.png | Bin 0 -> 142927 bytes src/AboutDialog.cpp | 173 +++++++++++++++++++++++++++++++++++++++++++++ src/AboutDialog.h | 50 +++++++++++++ src/AboutDialogBase.ui | 114 +++++++++++++++++++++++++++++ src/CMakeLists.txt | 4 +- src/MainWindow.cpp | 38 ++++++---- src/MainWindow.h | 12 ++-- src/MainWindowBase.ui | 20 ++---- src/__TODO/AboutDialog.cpp | 169 ------------------------------------------- src/__TODO/AboutDialog.h | 54 -------------- src/__TODO/AboutDialog.ui | 87 ----------------------- src/__TODO/MainWindow.ui | 68 +----------------- 14 files changed, 373 insertions(+), 417 deletions(-) delete mode 100755 icons/__TODO/banner.png create mode 100755 icons/banner.png create mode 100644 src/AboutDialog.cpp create mode 100644 src/AboutDialog.h create mode 100755 src/AboutDialogBase.ui delete mode 100644 src/__TODO/AboutDialog.cpp delete mode 100644 src/__TODO/AboutDialog.h diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 7d86613..90f4bf4 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -1,5 +1,6 @@ install( FILES + banner.png document-open.png document-properties.png document-save.png diff --git a/icons/__TODO/banner.png b/icons/__TODO/banner.png deleted file mode 100755 index d0884d6..0000000 Binary files a/icons/__TODO/banner.png and /dev/null differ diff --git a/icons/banner.png b/icons/banner.png new file mode 100755 index 0000000..d0884d6 Binary files /dev/null and b/icons/banner.png differ diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp new file mode 100644 index 0000000..51a0653 --- /dev/null +++ b/src/AboutDialog.cpp @@ -0,0 +1,173 @@ +/*************************************************************************** + * Copyright (C) 2006-2012 by Thomas Schweitzer * + * thomas-schweitzer(at)arcor.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License version 2.0 as * + * published by the Free Software Foundation. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program in the file LICENSE.GPL; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include "config.h" +#include "AboutDialog.h" + +//----#include "UiGuiVersion.h" + +//----#include +//----#include +//----#include +#include +#include +#include +#include +#include + +/*! + \class AboutDialog + \brief Displays a dialog window with information about UniversalIndentGUI +*/ + +/*! + \brief The constructor calls the setup function for the ui created by uic and adds + the GPL text to the text edit. + */ +AboutDialog::AboutDialog(TQWidget *parent, WFlags flags) : + AboutDialogBase(parent, NULL, FALSE, flags), m_timer(NULL) +{ + // For icon setup + const TQString ICONS_PATH(APP_ICONS_PATH); + + bannerLabel->setPixmap(TQPixmap(ICONS_PATH + "banner.png")); +//---- _dialogForm->authorTextBrowser->setOpenExternalLinks(true); +//---- _dialogForm->creditsTextBrowser->setOpenExternalLinks(true); +//---- +//---- TQString versionString = _dialogForm->versionTextBrowser->toHtml(); +//---- versionString = +//---- versionString.arg(PROGRAM_VERSION_STRING).arg(UiGuiVersion::getBuildRevision()).arg( +//---- UiGuiVersion::getBuildDate()); +//---- _dialogForm->versionTextBrowser->setHtml(versionString); +//---- +//---- _dialogForm->creditsTextBrowser->setHtml("" +//---- "
" +//---- "

Thanks go out to

" +//---- "

Nelson Tai for Chinese translation, good ideas and always fast answers.


" +//---- "

Sebastian Pipping for helping me bring UiGUI into the Debian repository and other good ideas.


" +//---- "

Oleksandr for Ukrainian and Russian translation.


" +//---- "

Erwan "leg" for French translation and the icon logo.


" +//---- "

The Scintilla project for their great text editing component.


" +//---- "

Riverbank for their Scintilla TQt wrapper TQScintilla.


" +//---- "

The Artistic Style project.


" +//---- "

The BCPP project.


" +//---- "

The Cobol Beautifier project.


" +//---- "

The CSSTidy project.


" +//---- "

The Fortran 90 PPR project.


" +//---- "

The GNU Indent project.


" +//---- "

The GreatCode project.


" +//---- "

The hindent project.


" +//---- "

The HTB project.


" +//---- "

The HTML Tidy project.


" +//---- "

The JsDecoder project.


" +//---- "

The JSPPP project.


" +//---- "

The Perltidy project.


" +//---- "

The PHP_Beautifier project.


" +//---- "

The phpCB project.


" +//---- "

The PHP Stylist project.


" +//---- "

The pindent project.


" +//---- "

The Pl/Sql tidy project.


" +//---- "

The Ruby Beautifier project.


" +//---- "

The Ruby Formatter project.


" +//---- "

The Shell Indent project.


" +//---- "

The Uncrustify project, specially Ben Gardner.


" +//---- "

The VBSBeautifier project.


" +//---- "

The XML Indent project.


" +//---- "

Nirvash for the initial Japanese translation.


" +//---- "

The Tango Project for their icons.


" +//---- "

famfamfam for the flag icons.


" +//---- "

Trolltech for their really great GUI framework .


" +//---- "

My girlfriend (meanwhile also wife) for putting my head right and not sit all the time in front of my computer ;-)

" +//---- ""); +//---- + m_scrollDirection = 1; + m_scrollSpeed = 100; + m_timer = new TQTimer(this); + + connect(m_timer, SIGNAL(timeout()), this, SLOT(scroll())); + connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); +} + +/*! + \brief Catches language change events and retranslates all needed widgets. + */ +void AboutDialog::changeEvent(TQEvent *event) +{ +//---- if (event->type() == TQEvent::LanguageChange) +//---- { +//---- _dialogForm->retranslateUi(this); +//---- +//---- TQString versionString = _dialogForm->versionTextBrowser->toHtml(); +//---- versionString = +//---- versionString.arg(PROGRAM_VERSION_STRING).arg(UiGuiVersion::getBuildRevision()).arg( +//---- UiGuiVersion::getBuildDate()); +//---- _dialogForm->versionTextBrowser->setHtml(versionString); +//---- } +//---- else +//---- { +//---- TQWidget::changeEvent(event); +//---- } +} + +/*! + \brief Reimplements the dialog execution function to init the credits scroller. + */ +void AboutDialog::show() +{ +//---- //creditsTextBrowser->verticalScrollBar()->setValue(0); + m_timer->start(m_scrollSpeed); + AboutDialogBase::show(); +} + +/*! + \brief This slot is called each m_timer timeout to scroll the credits textbrowser. + Also changes the scroll direction and speed when reaching the start or end. + */ +void AboutDialog::scroll() +{ +//---- TQScrollBar *scrollBar = _dialogForm->creditsTextBrowser->verticalScrollBar(); +//---- scrollBar->setValue(scrollBar->value() + m_scrollDirection); +//---- +//---- if (scrollBar->value() == scrollBar->maximum()) +//---- { +//---- // Toggle scroll direction and change scroll speed; +//---- m_scrollDirection = -1; +//---- m_scrollSpeed = 5; +//---- m_timer->stop(); +//---- m_timer->start(m_scrollSpeed); +//---- } +//---- else if (scrollBar->value() == scrollBar->minimum()) +//---- { +//---- // Toggle scroll direction and change scroll speed; +//---- m_scrollDirection = 1; +//---- m_scrollSpeed = 100; +//---- m_timer->stop(); +//---- m_timer->start(m_scrollSpeed); +//---- } +//---- +//---- _dialogForm->creditsTextBrowser->update(); +} + +void AboutDialog::accept() +{ + m_timer->stop(); + TQDialog::accept(); +} + +#include "AboutDialog.moc" diff --git a/src/AboutDialog.h b/src/AboutDialog.h new file mode 100644 index 0000000..2447b08 --- /dev/null +++ b/src/AboutDialog.h @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright (C) 2006-2012 by Thomas Schweitzer * + * thomas-schweitzer(at)arcor.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License version 2.0 as * + * published by the Free Software Foundation. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program in the file LICENSE.GPL; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include + + +class AboutDialog : public AboutDialogBase +{ + Q_OBJECT + + public: + AboutDialog(TQWidget *parent = NULL, WFlags flags = 0); + + public slots: + void show(); + + protected slots: + void accept(); + + private slots: + void scroll(); + + private: + void changeEvent(TQEvent *event); + + int m_scrollDirection; + int m_scrollSpeed; + TQTimer *m_timer; +}; + +#endif // ABOUTDIALOG_H diff --git a/src/AboutDialogBase.ui b/src/AboutDialogBase.ui new file mode 100755 index 0000000..8bc3dab --- /dev/null +++ b/src/AboutDialogBase.ui @@ -0,0 +1,114 @@ + + AboutDialogBase + + + AboutDialogBase + + + + 0 + 0 + 588 + 512 + + + + + 0 + 5 + 0 + 0 + + + + + 588 + 333 + + + + About UniversalIndentGUI + + + + 0 + + + + frame + + + StyledPanel + + + + + bannerLabel + + + + 0 + 0 + 0 + 0 + + + + + 570 + 87 + + + + + 570 + 87 + + + + + + + + + + spacer1 + + + TQt::Horizontal + + + + 40 + 20 + + + + + + okButton + + + OK + + + + + spacer2 + + + TQt::Horizontal + + + + 40 + 20 + + + + + + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 19c34a8..56768b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,8 +26,8 @@ link_directories( set( target universal-indent-gui-tqt ) set( ${target}_SRCS - MainWindowBase.ui ToolBarWidget.ui MainWindow.cpp main.cpp - UiGuiVersion.cpp + AboutDialogBase.ui MainWindowBase.ui ToolBarWidget.ui + AboutDialog.cpp MainWindow.cpp main.cpp UiGuiVersion.cpp ) tde_add_executable( ${target} AUTOMOC diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 2d730ac..2d4c242 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -25,7 +25,7 @@ ///-- #include "SettingsPaths.h" ///-- #include "ToolBarWidget.h" -///-- #include "AboutDialog.h" +#include "AboutDialog.h" ///-- #include "AboutDialogGraphicsView.h" ///-- #include "UiGuiSettings.h" ///-- #include "UiGuiSettingsDialog.h" @@ -79,9 +79,9 @@ \brief Constructs the main window. */ MainWindow::MainWindow(TQString file2OpenOnStart, TQWidget *parent) : - MainWindowBase(parent) -///- , _mainWindowForm(NULL), _qSciSourceCodeEditor(NULL), _settings(NULL), -///- _highlighter(NULL), _textEditVScrollBar(NULL), _aboutDialog(NULL), _aboutDialogGraphicsView( + MainWindowBase(parent), m_aboutDialog(NULL) +///- _mainWindowForm(NULL), _qSciSourceCodeEditor(NULL), _settings(NULL), +///- _highlighter(NULL), _textEditVScrollBar(NULL), _aboutDialogGraphicsView( ///- NULL), _settingsDialog(NULL), _encodingActionGroup(NULL), _saveEncodedActionGroup(NULL), ///- _highlighterActionGroup(NULL), _uiGuiTranslator(NULL), _qTTranslator(NULL), _toolBarWidget( ///- NULL), _indentHandler(NULL), _textEditLineColumnInfoLabel(NULL) @@ -116,9 +116,10 @@ MainWindow::MainWindow(TQString file2OpenOnStart, TQWidget *parent) : ///-- createHighlighterMenu(); ///-- ///-- -///-- // Generate about dialog box -///-- _aboutDialog = new AboutDialog(this, TQt::SplashScreen); -///-- _aboutDialogGraphicsView = new AboutDialogGraphicsView(_aboutDialog, this); + // Generate about dialog box + //m_aboutDialog = new AboutDialog(this, WStyle_Splash); + m_aboutDialog = new AboutDialog(this); +///-- _aboutDialogGraphicsView = new AboutDialogGraphicsView(m_aboutDialog, this); connect(actionAboutUniversalIndentGUITQt, SIGNAL(activated()), this, SLOT(showAboutDialog())); ///-- ///-- // Generate settings dialog box @@ -144,13 +145,19 @@ MainWindow::MainWindow(TQString file2OpenOnStart, TQWidget *parent) : ///-- setAcceptDrops(true); } +MainWindow::~MainWindow() +{ + delete m_aboutDialog; + ///-- _settings.clear(); +} + ///-- /*! ///-- \brief Initializes the main window by creating the main gui and make some _settings. ///-- */ void MainWindow::initMainWindow() { // For icon setup - TQString ICONS_PATH(APP_ICONS_PATH); + const TQString ICONS_PATH(APP_ICONS_PATH); // Application icon setIcon(TQPixmap(ICONS_PATH + "universalIndentGUI_64x64.png")); // Menu icons @@ -245,7 +252,7 @@ void MainWindow::initMainWindow() void MainWindow::initToolBar() { // For icon setup - TQString ICONS_PATH(APP_ICONS_PATH); + const TQString ICONS_PATH(APP_ICONS_PATH); // Create the tool bar and add it to the main window. m_toolBarWidget = new ToolBarWidget(toolBar); @@ -268,7 +275,7 @@ void MainWindow::initToolBar() //m_toolBarWidget->cbLivePreview->setPixmap(TQPixmap(ICONS_PATH + "live-preview.png")); connect(m_toolBarWidget->cbLivePreview, SIGNAL(toggled(bool)), this, SLOT(previewTurnedOnOff(bool))); connect(m_toolBarWidget->cbLivePreview, SIGNAL(toggled(bool)), - actionLiveIndentPreview, SLOT(setChecked(bool))); + actionLiveIndentPreview, SLOT(setOn(bool))); ///-- connect(actionLiveIndentPreview, SIGNAL(toggled( ///-- bool)), m_toolBarWidget->cbLivePreview, SLOT(setChecked(bool))); } @@ -1605,11 +1612,12 @@ void MainWindow::openFileFromRecentlyOpenedList(int recentlyOpenedActionId) */ void MainWindow::showAboutDialog() { -///-- //TQPixmap originalPixmap = TQPixmap::grabWindow(TQApplication::desktop()->screen()->winId()); -///-- //tqDebug("in main pixmap width %d, numScreens = %d", originalPixmap.size().width(), -///-- // TQApplication::desktop()->availableGeometry().width()); -///-- //_aboutDialogGraphicsView->setScreenshotPixmap( originalPixmap ); -///-- _aboutDialogGraphicsView->show(); + //TQPixmap originalPixmap = TQPixmap::grabWindow(TQApplication::desktop()->screen()->winId()); + //tqDebug("in main pixmap width %d, numScreens = %d", originalPixmap.size().width(), + // TQApplication::desktop()->availableGeometry().width()); + //_aboutDialogGraphicsView->setScreenshotPixmap( originalPixmap ); + //----_aboutDialogGraphicsView->show(); + m_aboutDialog->show(); } ///-- /*! diff --git a/src/MainWindow.h b/src/MainWindow.h index 103b26c..cb4f7c1 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -21,12 +21,12 @@ #define MAINWINDOW_H #include "MainWindowBase.h" -#include "ntqobjectdefs.h" +#include "tqobjdefs.h" /// #include "UiGuiSettings.h" /// /// class UiGuiSettingsDialog; -/// class AboutDialog; +class AboutDialog; /// class AboutDialogGraphicsView; /// class UiGuiHighlighter; /// class IndentHandler @@ -47,11 +47,7 @@ class MainWindow : public MainWindowBase public: //! Constructor MainWindow(TQString file2OpenOnStart = "", TQWidget *parent = NULL); - - ~MainWindow() - { -///-- _settings.clear(); - } + ~MainWindow(); ///-- protected: ///-- void closeEvent(TQCloseEvent *event); @@ -109,7 +105,7 @@ class MainWindow : public MainWindowBase ///-- TQString _sourceViewContent; ///-- UiGuiHighlighter *_highlighter; ///-- TQScrollBar *_textEditVScrollBar; -///-- AboutDialog *_aboutDialog; + AboutDialog *m_aboutDialog; ///-- AboutDialogGraphicsView *_aboutDialogGraphicsView; ///-- UiGuiSettingsDialog *_settingsDialog; int _actionClearRecentlyOpenedListId; diff --git a/src/MainWindowBase.ui b/src/MainWindowBase.ui index c5e124f..9d478b4 100755 --- a/src/MainWindowBase.ui +++ b/src/MainWindowBase.ui @@ -196,7 +196,7 @@ Export - Export the currently visible source + Export the currently visible source. @@ -207,7 +207,7 @@ HTML - Export the currently visible source code as HTML document + Export the currently visible source code as HTML document. @@ -218,7 +218,7 @@ PDF - Export the currently visible source code as PDF document + Export the currently visible source code as PDF document. @@ -300,7 +300,7 @@ Set Syntax Highlighter - Set the syntax highlighter to use + Set the syntax highlighter to use. @@ -337,7 +337,7 @@ Auto open last source file on startup - If selected opens last source code file on startup + If selected opens last source code file on startup. false @@ -389,16 +389,6 @@ activated() MainWindowBase close() - - - -1 - -1 - - - 399 - 299 - - diff --git a/src/__TODO/AboutDialog.cpp b/src/__TODO/AboutDialog.cpp deleted file mode 100644 index 3cbdf4f..0000000 --- a/src/__TODO/AboutDialog.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006-2012 by Thomas Schweitzer * - * thomas-schweitzer(at)arcor.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License version 2.0 as * - * published by the Free Software Foundation. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program in the file LICENSE.GPL; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#include "AboutDialog.h" -#include "ui_AboutDialog.h" - -#include "UiGuiVersion.h" - -#include -#include -#include -#include -#include - -/*! - \class AboutDialog - \brief Displays a dialog window with information about UniversalIndentGUI -*/ - -/*! - \brief The constructor calls the setup function for the ui created by uic and adds - the GPL text to the text edit. - */ -AboutDialog::AboutDialog(TQWidget *parent, TQt::WindowFlags flags) : - TQDialog(parent, flags), _dialogForm(NULL), _timer(NULL) -{ - _dialogForm = new Ui::AboutDialog(); - _dialogForm->setupUi(this); - - _dialogForm->authorTextBrowser->setOpenExternalLinks(true); - _dialogForm->creditsTextBrowser->setOpenExternalLinks(true); - - TQString versionString = _dialogForm->versionTextBrowser->toHtml(); - versionString = - versionString.arg(PROGRAM_VERSION_STRING).arg(UiGuiVersion::getBuildRevision()).arg( - UiGuiVersion::getBuildDate()); - _dialogForm->versionTextBrowser->setHtml(versionString); - - _dialogForm->creditsTextBrowser->setHtml("" - "
" - "

Thanks go out to

" - "

Nelson Tai for Chinese translation, good ideas and always fast answers.


" - "

Sebastian Pipping for helping me bring UiGUI into the Debian repository and other good ideas.


" - "

Oleksandr for Ukrainian and Russian translation.


" - "

Erwan "leg" for French translation and the icon logo.


" - "

The Scintilla project for their great text editing component.


" - "

Riverbank for their Scintilla TQt wrapper TQScintilla.


" - "

The Artistic Style project.


" - "

The BCPP project.


" - "

The Cobol Beautifier project.


" - "

The CSSTidy project.


" - "

The Fortran 90 PPR project.


" - "

The GNU Indent project.


" - "

The GreatCode project.


" - "

The hindent project.


" - "

The HTB project.


" - "

The HTML Tidy project.


" - "

The JsDecoder project.


" - "

The JSPPP project.


" - "

The Perltidy project.


" - "

The PHP_Beautifier project.


" - "

The phpCB project.


" - "

The PHP Stylist project.


" - "

The pindent project.


" - "

The Pl/Sql tidy project.


" - "

The Ruby Beautifier project.


" - "

The Ruby Formatter project.


" - "

The Shell Indent project.


" - "

The Uncrustify project, specially Ben Gardner.


" - "

The VBSBeautifier project.


" - "

The XML Indent project.


" - "

Nirvash for the initial Japanese translation.


" - "

The Tango Project for their icons.


" - "

famfamfam for the flag icons.


" - "

Trolltech for their really great GUI framework .


" - "

My girlfriend (meanwhile also wife) for putting my head right and not sit all the time in front of my computer ;-)

" - ""); - - _scrollDirection = 1; - _scrollSpeed = 100; - _timer = new TQTimer(this); - connect(_timer, SIGNAL(timeout()), this, SLOT(scroll())); - connect(this, SIGNAL(accepted()), _timer, SLOT(stop())); -} - -/*! - \brief Catches language change events and retranslates all needed widgets. - */ -void AboutDialog::changeEvent(TQEvent *event) -{ - if (event->type() == TQEvent::LanguageChange) - { - _dialogForm->retranslateUi(this); - - TQString versionString = _dialogForm->versionTextBrowser->toHtml(); - versionString = - versionString.arg(PROGRAM_VERSION_STRING).arg(UiGuiVersion::getBuildRevision()).arg( - UiGuiVersion::getBuildDate()); - _dialogForm->versionTextBrowser->setHtml(versionString); - } - else - { - TQWidget::changeEvent(event); - } -} - -/*! - \brief Reimplements the dialog execution function to init the credits scroller. - */ -int AboutDialog::exec() -{ - //creditsTextBrowser->verticalScrollBar()->setValue(0); - _timer->start(_scrollSpeed); - return TQDialog::exec(); -} - -/*! - \brief This slot is called each _timer timeout to scroll the credits textbrowser. - Also changes the scroll direction and speed when reaching the start or end. - */ -void AboutDialog::scroll() -{ - TQScrollBar *scrollBar = _dialogForm->creditsTextBrowser->verticalScrollBar(); - scrollBar->setValue(scrollBar->value() + _scrollDirection); - - if (scrollBar->value() == scrollBar->maximum()) - { - // Toggle scroll direction and change scroll speed; - _scrollDirection = -1; - _scrollSpeed = 5; - _timer->stop(); - _timer->start(_scrollSpeed); - } - else if (scrollBar->value() == scrollBar->minimum()) - { - // Toggle scroll direction and change scroll speed; - _scrollDirection = 1; - _scrollSpeed = 100; - _timer->stop(); - _timer->start(_scrollSpeed); - } - - _dialogForm->creditsTextBrowser->update(); -} - -/*! - \brief Shows the about dialog and also starts the credits scroller. - */ -void AboutDialog::show() -{ - _timer->start(_scrollSpeed); - TQDialog::show(); -} diff --git a/src/__TODO/AboutDialog.h b/src/__TODO/AboutDialog.h deleted file mode 100644 index c849f7b..0000000 --- a/src/__TODO/AboutDialog.h +++ /dev/null @@ -1,54 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006-2012 by Thomas Schweitzer * - * thomas-schweitzer(at)arcor.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License version 2.0 as * - * published by the Free Software Foundation. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program in the file LICENSE.GPL; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#ifndef ABOUTDIALOG_H -#define ABOUTDIALOG_H - -#include - -namespace Ui -{ - class AboutDialog; -} - - -class AboutDialog : public TQDialog -{ - Q_OBJECT - - public: - AboutDialog(TQWidget *parent = NULL, TQt::WindowFlags flags = 0); - - public slots: - int exec(); - void show(); - - private slots: - void scroll(); - - private: - void changeEvent(TQEvent *event); - - Ui::AboutDialog *_dialogForm; - int _scrollDirection; - int _scrollSpeed; - TQTimer *_timer; -}; - -#endif // ABOUTDIALOG_H diff --git a/src/__TODO/AboutDialog.ui b/src/__TODO/AboutDialog.ui index dbc2b8c..3415427 100755 --- a/src/__TODO/AboutDialog.ui +++ b/src/__TODO/AboutDialog.ui @@ -2,69 +2,19 @@ AboutDialog - - - 0 - 0 - 588 - 512 - - - - - 0 - 0 - - - - - 588 - 333 - - - - About UniversalIndentGUI - :/mainWindow/info.png:/mainWindow/info.png - - 0 - TQFrame#frame { background-color: qlineargradient( x1:0, y1:0, x2:0, y2:1, stop:0 #FFFF60, stop:0.5 #D8C304, stop:1 #FFFF60 ); border: 2px solid #A89C57; border-radius: 4px;} - - TQFrame::StyledPanel - - - - 0 - 0 - - - - - 570 - 87 - - - - - 570 - 87 - - - - - :/aboutDialog/banner.png @@ -166,27 +116,8 @@ p, li { white-space: pre-wrap; } - - TQPushButton#okButton { background-color: qlineargradient( x1:0, y1:0, x2:0, y2:1, stop:0 #DCB28A, stop:0.5 #B8784B, stop:1 #DCB28A ); border: 2px solid #A89C57; border-radius: 4px;} TQPushButton:hover#okButton { background-color: qlineargradient( x1:0, y1:0, x2:0, y2:1, stop:0 #B8784B, stop:0.5 #DCB28A, stop:1 #B8784B ); } TQPushButton:pressed#okButton{ border: 2px solid #D8CB75 } - - - OK - - - - - TQt::Horizontal - - - - 40 - 20 - - - - @@ -197,22 +128,4 @@ p, li { white-space: pre-wrap; } - - - okButton - clicked() - AboutDialog - accept() - - - 278 - 253 - - - 96 - 254 - - - - diff --git a/src/__TODO/MainWindow.ui b/src/__TODO/MainWindow.ui index 9ac95b1..73200d1 100755 --- a/src/__TODO/MainWindow.ui +++ b/src/__TODO/MainWindow.ui @@ -5,26 +5,7 @@ MainWindowUi - - - - 6 - - - 0 - - - - - 0 - - - 2 - - - - - + @@ -66,52 +47,5 @@ - - - TQt::PreventContextMenu - - - Main Toolbar - - - TQt::Horizontal - - - - 16 - 16 - - - - TQt::ToolButtonTextBesideIcon - - - TopToolBarArea - - - false - - - - - - - - actionExit - triggered() - MainWindowUi - close() - - - -1 - -1 - - - 399 - 299 - - - - -- cgit v1.2.1