From 02c45cb50dd5ec94fe8482814a718ed5f9103165 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 8 Mar 2010 00:53:44 +0000 Subject: [PATCH] * FWWindow.cpp (FWWindow::startupLoad): final (hopefully) design of the welcome/startup window. Always showing startup tip dialog; added buttons to show "Getting started" and "summary of features" to the same dialog window. Fixes #1224 --- build_num | 2 +- doc/ChangeLog | 11 +++++++++-- src/gui/FWWindow.cpp | 23 ++++++----------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/build_num b/build_num index 11ef0e11d..68eef8b04 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2676 +#define BUILD_NUM 2684 diff --git a/doc/ChangeLog b/doc/ChangeLog index ef984f7f2..62fc7ffb7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,11 +1,18 @@ +2010-03-07 vadim + + * FWWindow.cpp (FWWindow::startupLoad): final (hopefully) design + of the welcome/startup window. Always showing startup tip dialog; + added buttons to show "Getting started" and "summary of features" + to the same dialog window. Fixes #1224 + 2010-02-28 yalovoy * refs #1202: Main menu "Rules" does not match rule context menu Items in the main menu Rules should get disabled and enabled just like items in the context menu do. Added action: copyRuleAction; cutRuleAction; pasteRuleAboveAction; pasteRuleBelowAction; disableRuleAction; enableRuleAction; - setColorEmptyAction; setColorRedAction; setColorBlueAction; - setColorOrangeAction; setColorPurpleAction; setColorGrayAction; + setColorEmptyAction; setColorRedAction; setColorBlueAction; + setColorOrangeAction; setColorPurpleAction; setColorGrayAction; setColorYellowAction; setColorGreenAction; Affected files: FWWindow.cpp diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp index 8bc01a09c..1163ef265 100644 --- a/src/gui/FWWindow.cpp +++ b/src/gui/FWWindow.cpp @@ -512,6 +512,12 @@ void FWWindow::updateWindowTitle() void FWWindow::startupLoad() { + if (! st->getBool("UI/NoStartTip")) + { + StartTipDialog *stdlg = new StartTipDialog(this); + stdlg->run(); + } + if (st->getCheckUpdates()) { QString update_url = CHECK_UPDATE_URL; @@ -546,23 +552,6 @@ void FWWindow::startupLoad() updateOpenRecentMenu(file); } - QString welcome_flag = QString("UI/%1/WelcomeShown").arg(VERSION); - - if (!st->getBool(welcome_flag)) - { - showWelcome(); - st->setBool(welcome_flag, true); - } else - { - // show tip of the day only if we did not show release notes. - // Two start-time pop-up dialogs == bad. - if (! st->getBool("UI/NoStartTip")) - { - StartTipDialog *stdlg = new StartTipDialog(this); - stdlg->run(); - } - } - prepareFileMenu(); }