diff options
Diffstat (limited to 'src/MainWindow.cpp')
| -rw-r--r-- | src/MainWindow.cpp | 38 |
1 files changed, 23 insertions, 15 deletions
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(); } ///-- /*! |