From 8280cc17ccf2c0b18a269397f530da7a97b45f3b Mon Sep 17 00:00:00 2001 From: Vadim Peretokin Date: Sun, 30 Dec 2012 16:51:10 +1000 Subject: [PATCH] - added module manager to buttons bar - changed statustips (which were never shown because we don't use a status bar in the main window) to tooltips --- src/icons/module-manager.png | Bin 0 -> 3659 bytes src/icons/package-manager.png | Bin 0 -> 3547 bytes src/mudlet.cpp | 54 ++++++++++++++++++++--------------------- src/mudlet_alpha.qrc | 2 ++ 4 files changed, 29 insertions(+), 27 deletions(-) create mode 100755 src/icons/module-manager.png create mode 100644 src/icons/package-manager.png diff --git a/src/icons/module-manager.png b/src/icons/module-manager.png new file mode 100755 index 0000000000000000000000000000000000000000..946793731f10b376d15a40e23d9679dad839808a GIT binary patch literal 3659 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"Connect To Server")); + actionConnect->setToolTip(tr("Connect to a MUD")); mpMainToolBar->addAction( actionConnect ); QAction * actionTriggers = new QAction(QIcon(":/icons/tools-wizard.png"), tr("Triggers"), this); - actionTriggers->setStatusTip(tr("Show Triggers")); + actionTriggers->setToolTip(tr("Show and edit triggers")); mpMainToolBar->addAction( actionTriggers ); QAction * actionAlias = new QAction(QIcon(":/icons/system-users.png"), tr("Aliases"), this); - actionAlias->setStatusTip(tr("Show Aliases")); + actionAlias->setToolTip(tr("Show and edit aliases")); actionAlias->setEnabled( true ); mpMainToolBar->addAction( actionAlias ); QAction * actionTimers = new QAction(QIcon(":/icons/chronometer.png"), tr("Timers"), this); - actionTimers->setStatusTip(tr("Show Timers")); + actionTimers->setToolTip(tr("Show and edit timers")); mpMainToolBar->addAction( actionTimers ); QAction * actionButtons = new QAction(QIcon(":/icons/bookmarks.png"), tr("Buttons"), this); - actionButtons->setStatusTip(tr("Show Easy Buttons")); + actionButtons->setToolTip(tr("Show and edit easy buttons")); mpMainToolBar->addAction( actionButtons ); QAction * actionScripts = new QAction(QIcon(":/icons/document-properties.png"), tr("Scripts"), this); actionScripts->setEnabled( true ); - actionScripts->setStatusTip(tr("Show Scripts")); + actionScripts->setToolTip(tr("Show and edit scripts")); mpMainToolBar->addAction( actionScripts ); QAction * actionKeys = new QAction(QIcon(":/icons/preferences-desktop-keyboard.png"), tr("Keys"), this); - actionKeys->setStatusTip(tr("Options")); + actionKeys->setToolTip(tr("Show and edit keys")); actionKeys->setEnabled( true ); mpMainToolBar->addAction( actionKeys ); QAction * actionIRC = new QAction(QIcon(":/icons/internet-telephony.png"), tr("Help Chat"), this); - actionIRC->setStatusTip(tr("help chat on IRC")); + actionIRC->setToolTip(tr("Join Mudlet help chat on IRC")); mpMainToolBar->addAction( actionIRC ); QAction * actionMapper = new QAction(QIcon(":/icons/applications-internet.png"), tr("Map"), this); - actionMapper->setStatusTip(tr("show map")); + actionMapper->setToolTip(tr("Show/hide the map")); mpMainToolBar->addAction( actionMapper ); QAction * actionHelp = new QAction(QIcon(":/icons/help-hint.png"), tr("Manual"), this); - actionHelp->setStatusTip(tr("Browse Reference Material and Documentation")); + actionHelp->setToolTip(tr("Browse reference material and documentation")); mpMainToolBar->addAction( actionHelp ); QAction * actionOptions = new QAction(QIcon(":/icons/configure.png"), tr("Settings"), this); - actionOptions->setStatusTip(tr("Settings, Options and Preferences")); + actionOptions->setToolTip(tr("See and edit profile preferences")); mpMainToolBar->addAction( actionOptions ); QAction * actionNotes = new QAction(QIcon(":/icons/applications-accessories.png"), tr("Notepad"), this); - actionNotes->setStatusTip(tr("take notes")); + actionNotes->setToolTip(tr("Take notes")); mpMainToolBar->addAction( actionNotes ); - QAction * actionPackageM = new QAction(QIcon(":/icons/utilities-file-archiver.png"), tr("Package Manager"), this); - actionPackageM->setStatusTip(tr("Package Manager")); + QAction * actionPackageM = new QAction(QIcon(":/icons/package-manager.png"), tr("Package Manager"), this); + actionPackageM->setToolTip(tr("Package Manager - allows you to install xmls, .mpackages")); mpMainToolBar->addAction( actionPackageM ); -// QAction * menuActionPackageM = new QAction("Package Manager", this); -// menuActionPackageM->setStatusTip(tr("Package Manager")); -// connect(menuActionPackageM, SIGNAL(triggered()), this, SLOT(slot_package_manager())); -// QMenu * _miscMenu = new QMenu("Misc", this); -// _miscMenu->addAction(menuActionPackageM); -// menuBar()->addMenu(_miscMenu); + QAction * actionModuleM = new QAction(QIcon(":/icons/module-manager.png"), tr("Module Manager"), this); + actionModuleM->setToolTip(tr("Module Manager - allows you to install xmls, .mpackages that are syncronized across multiple profile (good for scripts that you use on several profiles)")); + mpMainToolBar->addAction( actionModuleM ); QAction * actionReplay = new QAction(QIcon(":/icons/media-optical.png"), tr("Replay"), this); - actionNotes->setStatusTip(tr("load replay")); + actionNotes->setToolTip(tr("Load a replay")); mpMainToolBar->addAction( actionReplay ); actionReconnect = new QAction(QIcon(":/icons/system-restart.png"), tr("Reconnect"), this); - actionNotes->setStatusTip(tr("reconnect")); + actionNotes->setToolTip(tr("Reconnect to the game")); mpMainToolBar->addAction( actionReconnect ); QAction * actionMultiView = new QAction(QIcon(":/icons/view-split-left-right.png"), tr("MultiView"), this); - actionMultiView->setStatusTip(tr("MultiView")); + actionMultiView->setToolTip(tr("MultiView")); mpMainToolBar->addAction( actionMultiView ); QAction * actionStopAllTriggers = new QAction(QIcon(":/icons/edit-bomb.png"), tr("Stop All Triggers"), this); - actionStopAllTriggers->setStatusTip(tr("stop all triggers, alias, actions, timers and scripts")); + actionStopAllTriggers->setToolTip(tr("Stop all triggers, alias, actions, timers and scripts")); //mpMainToolBar->addAction( actionStopAllTriggers ); @@ -261,12 +258,12 @@ mudlet::mudlet() QAction * actionAbout = new QAction(QIcon(":/icons/mudlet_main_32px.png"), tr("About"), this); - actionAbout->setStatusTip(tr("About")); + actionAbout->setToolTip(tr("About Mudlet")); mpMainToolBar->addAction( actionAbout ); QAction * actionCloseProfile = new QAction(QIcon(":/icons/window-close.png"), tr("Close"), this); actionScripts->setEnabled( true ); - actionScripts->setStatusTip(tr("close connection")); + actionScripts->setToolTip(tr("Close profile")); //mpMainToolBar->addAction( actionCloseProfile ); @@ -306,7 +303,7 @@ mudlet::mudlet() setFont( mainFont ); mainPane->setFont( mainFont ); mpTabBar->setFont( mdiFont ); - QIcon noIcon; + mainPane->show(); connect(actionConnect, SIGNAL(triggered()), this, SLOT(connectToServer())); connect(actionHelp, SIGNAL(triggered()), this, SLOT(show_help_dialog())); @@ -326,6 +323,7 @@ mudlet::mudlet() connect(actionMapper, SIGNAL(triggered()), this, SLOT(slot_mapper())); connect(actionIRC, SIGNAL(triggered()), this, SLOT(slot_irc())); connect(actionPackageM, SIGNAL(triggered()), this, SLOT(slot_package_manager())); + connect(actionModuleM, SIGNAL(triggered()), this, SLOT(slot_module_manager())); @@ -906,6 +904,7 @@ void mudlet::disableToolbarButtons() mpMainToolBar->actions()[10]->setEnabled( false ); mpMainToolBar->actions()[11]->setEnabled( false ); mpMainToolBar->actions()[12]->setEnabled( false ); + mpMainToolBar->actions()[13]->setEnabled( false ); } void mudlet::enableToolbarButtons() @@ -921,6 +920,7 @@ void mudlet::enableToolbarButtons() mpMainToolBar->actions()[10]->setEnabled( true ); mpMainToolBar->actions()[11]->setEnabled( true ); mpMainToolBar->actions()[12]->setEnabled( true ); + mpMainToolBar->actions()[13]->setEnabled( true ); } bool mudlet::openWindow( Host * pHost, QString & name ) diff --git a/src/mudlet_alpha.qrc b/src/mudlet_alpha.qrc index 7b7440e..a8dbf3e 100755 --- a/src/mudlet_alpha.qrc +++ b/src/mudlet_alpha.qrc @@ -124,5 +124,7 @@ icons/folder-grey-locked.png icons/tag_checkbox_checked_grey.png icons/tag_checkbox-grey.png + icons/package-manager.png + icons/module-manager.png -- 1.7.9.5