hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 12:44:07 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity
goldendict-ng/mainwindow.cc

3657 lines
103 KiB
C++
Raw Normal View History

Update year in copyright notices.
2012-02-20 21:47:14 +00:00
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#include "mainwindow.hh"
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
#include "editdictionaries.hh"
#include "loaddictionaries.hh"
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
#include "preferences.hh"
Implement Credits window in the About dialog to show project contributors. The actual credits file is to be fully populated yet.
2010-11-14 16:28:50 +00:00
#include "about.hh"
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
#include "mruqmenu.hh"
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
#include <limits.h>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
#include <QDir>
#include <QMessageBox>
#include <QIcon>
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
#include <QList>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
#include <QToolBar>
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
#include <QCloseEvent>
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
#include <QDesktopServices>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
#include <set>
#include <map>
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
#include "dprintf.hh"
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
#include <QDebug>
Import history from file
2012-09-10 13:01:35 +00:00
#include <QTextStream>
Show information about a dictionary on rigth mouse click in "Found in" pane
2012-09-24 12:51:51 +00:00
#include "dictinfo.hh"
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
#include "fsencoding.hh"
#include <QProcess>
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
#include "historypanewidget.hh"
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
#include <QCryptographicHash>
Initialize ssl libraries at program start (may affect on issue #303)
2013-06-07 13:00:30 +00:00
#include <QRunnable>
#include <QThreadPool>
#include <QSslConfiguration>
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Added full-screen mode for Mac OS X Lion Adapted from https://github.com/bjorn/tiled/tree/master/src/tiled
2012-06-03 18:29:49 +00:00
#ifdef Q_OS_MAC
#include "lionsupport.h"
#endif
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#ifdef Q_OS_WIN32
#include <windows.h>
#include "mouseover_win32/GDDataTranfer.h"
Win-specific: Properly scan right-to-left words in GD window
2013-01-26 14:49:02 +00:00
#include "wstring.hh"
#include "wstring_qt.hh"
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#endif
Focus GoldenDict window after restoring it from tray by hotkey under Ubuntu (issue #95)
2012-12-29 10:01:36 +00:00
#ifdef Q_WS_X11
#include <QX11Info>
#include <X11/Xlib.h>
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
using std::set;
using std::wstring;
using std::map;
using std::pair;
Initialize ssl libraries at program start (may affect on issue #303)
2013-06-07 13:00:30 +00:00
#ifndef QT_NO_OPENSSL
class InitSSLRunnable : public QRunnable
{
virtual void run()
{
/// This action force SSL library initialisation which may continue a few seconds
QSslConfiguration::setDefaultConfiguration( QSslConfiguration::defaultConfiguration() );
}
};
#endif
+ Implemented the ability to change program's language. * Russian translation updated to include new strings, others were fixed a bit.
2009-04-12 20:46:25 +00:00
MainWindow::MainWindow( Config::Class & cfg_ ):
Properly handle QApplication::commitData(), hopefully providing proper config file saving when the system shuts down.
2010-06-28 15:14:07 +00:00
commitDataCompleted( false ),
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
trayIcon( 0 ),
* Incorporate group selector into the search pane's titlebar, replacing the original with it.
2009-04-20 14:13:39 +00:00
groupLabel( &searchPaneTitleBar ),
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
foundInDictsLabel( &dictsPaneTitleBar ),
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
escAction( this ),
* Instead of clearing the translation line when pressing Esc, we merely select all its text. This allows both making new query or refining the old one easily.
2009-04-12 22:36:47 +00:00
focusTranslateLineAction( this ),
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
addTabAction( this ),
closeCurrentTabAction( this ),
added drop-down tab list
2010-09-16 18:52:40 +00:00
closeAllTabAction( this ),
closeRestTabAction( this ),
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
switchToNextTabAction( this ),
switchToPrevTabAction( this ),
Added menu accelerators.
2012-12-30 09:29:19 +00:00
showDictBarNamesAction( tr( "Show Names in Dictionary &Bar" ), this ),
useSmallIconsInToolbarsAction( tr( "Show Small Icons in &Toolbars" ), this ),
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
toggleMenuBarAction( tr( "&Menubar" ), this ),
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
switchExpandModeAction( this ),
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
trayIconMenu( this ),
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
addTab( this ),
+ Implemented the ability to change program's language. * Russian translation updated to include new strings, others were fixed a bit.
2009-04-12 20:46:25 +00:00
cfg( cfg_ ),
Make the default history item length to be the same as the limit for the headwords. So, it is 256 now. And configurable via the same parameter in the config file: maxHeadwordSize.
2013-01-17 14:24:13 +00:00
history( History::Load(), cfg_.preferences.maxStringsInHistory, cfg_.maxHeadwordSize ),
New interface preference: Context menu dictionaries limit Controls both context menus, in the dictionary bar and in the article view. Can be adjusted in Preferences -> Interface -> Context menu dictionaries limit. By default, it is set to 20.
2013-06-11 18:31:01 +00:00
dictionaryBar( this, configEvents, cfg.editDictionaryCommandLine, cfg.preferences.maxDictionaryRefsInContextMenu ),
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
articleMaker( dictionaries, groupInstances, cfg.preferences.displayStyle,
cfg.preferences.addonStyle ),
+ Add an option to block content (images, frames etc) not originating from the site the user browses. This effectively hides all advertisements on the websites.
2009-08-31 12:18:08 +00:00
articleNetMgr( this, dictionaries, articleMaker,
Added an option to hide GoldenDict identification in the HTTP User-Agent headers (Issue #259). A new preference in the "Network" tab is added: * Do not identify GoldenDict in HTTP headers.
2013-04-08 12:20:12 +00:00
cfg.preferences.disallowContentFromOtherSites, cfg.preferences.hideGoldenDictHeader ),
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
dictNetMgr( this ),
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
wordFinder( this ),
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
newReleaseCheckTimer( this ),
Don't delete latest release reply directly in slot
2013-06-07 12:59:18 +00:00
latestReleaseReply( 0 ),
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
wordListSelChanged( false )
Properly restore main window maximized state when it activated through tray icon
2013-01-23 20:36:53 +00:00
, wasMaximized( false )
Don't show welcome page header in window title (issue #195)
2013-01-31 13:01:08 +00:00
, blockUpdateWindowTitle( false )
Uninitialized variable in windows builds
2012-12-13 16:17:44 +00:00
#ifdef Q_OS_WIN32
, gdAskMessage( 0xFFFFFFFF )
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
Initialize ssl libraries at program start (may affect on issue #303)
2013-06-07 13:00:30 +00:00
#ifndef QT_NO_OPENSSL
QThreadPool::globalInstance()->start( new InitSSLRunnable );
#endif
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
applyQtStyleSheet( cfg.preferences.displayStyle, cfg.preferences.addonStyle );
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.setupUi( this );
Allow to collapse/expand articles; auto collapse for big articles (issue #331)
2013-06-02 11:20:33 +00:00
articleMaker.setCollapseParameters( cfg.preferences.collapseBigArticles, cfg.preferences.articleSizeLimit );
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
// use our own, cutsom statusbar
setStatusBar(0);
mainStatusBar = new MainStatusBar( this );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
// Make the toolbar
Added menu accelerators.
2012-12-30 09:29:19 +00:00
navToolbar = addToolBar( tr( "&Navigation" ) );
+ Save main window's state and geometry on exit and restore it back on startup.
2009-04-03 21:24:07 +00:00
navToolbar->setObjectName( "navToolbar" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
navBack = navToolbar->addAction( QIcon( ":/icons/previous.png" ), tr( "Back" ) );
Names for backButton, forwardButton, soundButton and a couple of separators.
2012-12-27 08:30:43 +00:00
navToolbar->widgetForAction( navBack )->setObjectName( "backButton" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
navForward = navToolbar->addAction( QIcon( ":/icons/next.png" ), tr( "Forward" ) );
Names for backButton, forwardButton, soundButton and a couple of separators.
2012-12-27 08:30:43 +00:00
navToolbar->widgetForAction( navForward )->setObjectName( "forwardButton" );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Fixed #205: Visual glitches in the new UI on KDE/Linux.
2013-02-07 15:24:24 +00:00
QWidget * translateBoxWidget = new QWidget( this );
QHBoxLayout * translateBoxLayout = new QHBoxLayout( translateBoxWidget );
translateBoxWidget->setLayout( translateBoxLayout );
translateBoxLayout->setContentsMargins( 0, 0, 0, 0 );
translateBoxLayout->setSpacing( 0 );
Fixed #152: Magic wand is located before the translation input, should be after.
2013-01-06 11:22:20 +00:00
// translate box
groupListInToolbar = new GroupComboBox( navToolbar );
Fixed #205: Visual glitches in the new UI on KDE/Linux.
2013-02-07 15:24:24 +00:00
groupListInToolbar->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
groupListInToolbar->setSizeAdjustPolicy( QComboBox::AdjustToContents );
translateBoxLayout->addWidget( groupListInToolbar );
Fixed #152: Magic wand is located before the translation input, should be after.
2013-01-06 11:22:20 +00:00
translateBox = new TranslateBox( navToolbar );
Additional fix for #205.
2013-02-07 18:15:34 +00:00
translateBox->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed );
Fixed #205: Visual glitches in the new UI on KDE/Linux.
2013-02-07 15:24:24 +00:00
translateBoxLayout->addWidget( translateBox );
translateBoxToolBarAction = navToolbar->addWidget( translateBoxWidget );
Fixed #152: Magic wand is located before the translation input, should be after.
2013-01-06 11:22:20 +00:00
// scan popup
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
beforeScanPopupSeparator = navToolbar->addSeparator();
beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
Names for backButton, forwardButton, soundButton and a couple of separators.
2012-12-27 08:30:43 +00:00
navToolbar->widgetForAction( beforeScanPopupSeparator )->setObjectName( "beforeScanPopupSeparator" );
When scan pop-up button is hidden on the toolbar, hide the extra separator as well (patch by Gloggy <glogg@mail.ru>)
2011-05-31 03:35:43 +00:00
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
enableScanPopup = navToolbar->addAction( QIcon( ":/icons/wizard.png" ), tr( "Scan Popup" ) );
enableScanPopup->setCheckable( true );
enableScanPopup->setVisible( cfg.preferences.enableScanPopup );
Fixed #152: Magic wand is located before the translation input, should be after.
2013-01-06 11:22:20 +00:00
navToolbar->widgetForAction( enableScanPopup )->setObjectName( "scanPopupButton" );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
if ( cfg.preferences.enableScanPopup && cfg.preferences.startWithScanPopupOn )
enableScanPopup->setChecked( true );
connect( enableScanPopup, SIGNAL( toggled( bool ) ),
this, SLOT( scanEnableToggled( bool ) ) );
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
afterScanPopupSeparator = navToolbar->addSeparator();
afterScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
Names for backButton, forwardButton, soundButton and a couple of separators.
2012-12-27 08:30:43 +00:00
navToolbar->widgetForAction( afterScanPopupSeparator )->setObjectName( "afterScanPopupSeparator" );
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
Fixed #152: Magic wand is located before the translation input, should be after.
2013-01-06 11:22:20 +00:00
// sound
+ Alt+S shortcut pronounces word. + Alt+M shortcut lists matches in scan popup window.
2009-05-14 19:46:25 +00:00
navPronounce = navToolbar->addAction( QIcon( ":/icons/playsound.png" ), tr( "Pronounce Word (Alt+S)" ) );
navPronounce->setShortcut( QKeySequence( "Alt+S" ) );
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
navPronounce->setEnabled( false );
Names for backButton, forwardButton, soundButton and a couple of separators.
2012-12-27 08:30:43 +00:00
navToolbar->widgetForAction( navPronounce )->setObjectName( "soundButton" );
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
connect( navPronounce, SIGNAL( triggered() ),
this, SLOT( pronounce() ) );
added zoom buttons
2009-04-30 19:57:25 +00:00
// zooming
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
// named separator (to be able to hide it via CSS)
navToolbar->widgetForAction( navToolbar->addSeparator() )->setObjectName( "separatorBeforeZoom" );
* Simpler tooltips for zooming actions.
2009-05-01 20:10:47 +00:00
zoomIn = navToolbar->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Zoom In" ) );
Additional shortcut for ZoomIn/WordsZoomIn actions (Ctrl+= and Alt+=). Browsers do the same for the ZoomIn action, so that it is easier to press with just two button presses instead of three.
2013-01-21 23:01:00 +00:00
zoomIn->setShortcuts( QList< QKeySequence >() <<
QKeySequence::ZoomIn <<
QKeySequence( "Ctrl+=" ) );
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
navToolbar->widgetForAction( zoomIn )->setObjectName( "zoomInButton" );
* Simpler tooltips for zooming actions.
2009-05-01 20:10:47 +00:00
zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) );
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
zoomOut->setShortcut( QKeySequence::ZoomOut );
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
navToolbar->widgetForAction( zoomOut )->setObjectName( "zoomOutButton" );
* Simpler tooltips for zooming actions.
2009-05-01 20:10:47 +00:00
zoomBase = navToolbar->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Normal Size" ) );
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
zoomBase->setShortcut( QKeySequence( "Ctrl+0" ) );
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
navToolbar->widgetForAction( zoomBase )->setObjectName( "zoomBaseButton" );
// named separator (to be able to hide it via CSS)
navToolbar->widgetForAction( navToolbar->addSeparator() )->setObjectName( "separatorBeforeSave" );
added zoom buttons
2009-04-30 19:57:25 +00:00
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
navToolbar->addAction( ui.saveArticle );
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
navToolbar->widgetForAction( ui.saveArticle )->setObjectName( "saveArticleButton" );
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
navToolbar->addAction( ui.print );
Name print, save, zoomIn, zoomOut and zoomBase buttons for convenient CSS styling.
2012-12-26 17:16:21 +00:00
navToolbar->widgetForAction( ui.print )->setObjectName( "printButton" );
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
Added a new "Menu Button" when the main menubar is hidden. This button is very similar to Chrome browser's (wrench) button.
2012-12-29 18:46:43 +00:00
beforeOptionsSeparator = navToolbar->addSeparator();
navToolbar->widgetForAction( beforeOptionsSeparator )->setObjectName( "beforeOptionsSeparator" );
beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar);
QMenu * buttonMenu = new QMenu( this );
buttonMenu->addAction( ui.dictionaries );
buttonMenu->addAction( ui.preferences );
buttonMenu->addSeparator();
buttonMenu->addMenu( ui.menuHistory );
buttonMenu->addSeparator();
buttonMenu->addMenu( ui.menuFile );
buttonMenu->addMenu( ui.menuView );
buttonMenu->addMenu( ui.menu_Help );
Tweaks for the Menu Button size (closes #176).
2013-01-23 13:40:49 +00:00
menuButton = new QToolButton( navToolbar );
Added a new "Menu Button" when the main menubar is hidden. This button is very similar to Chrome browser's (wrench) button.
2012-12-29 18:46:43 +00:00
menuButton->setPopupMode( QToolButton::InstantPopup );
menuButton->setMenu( buttonMenu );
menuButton->setIcon( QIcon (":/icons/menu_button.png") );
menuButton->addAction( ui.menuOptions );
menuButton->setToolTip( tr( "Menu Button" ) );
menuButton->setObjectName( "menuButton" );
MenuButton should not have focus.
2012-12-31 18:23:14 +00:00
menuButton->setFocusPolicy( Qt::NoFocus );
Added a new "Menu Button" when the main menubar is hidden. This button is very similar to Chrome browser's (wrench) button.
2012-12-29 18:46:43 +00:00
menuButtonAction = navToolbar->addWidget(menuButton);
menuButtonAction->setVisible( cfg.preferences.hideMenubar );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
// Make the search pane's titlebar
groupLabel.setText( tr( "Look up in:" ) );
groupListInDock = new GroupComboBox( &searchPaneTitleBar );
searchPaneTitleBarLayout.setContentsMargins( 8, 5, 8, 4 );
searchPaneTitleBarLayout.addWidget( &groupLabel );
searchPaneTitleBarLayout.addWidget( groupListInDock );
searchPaneTitleBarLayout.addStretch();
searchPaneTitleBar.setLayout( &searchPaneTitleBarLayout );
ui.searchPane->setTitleBarWidget( &searchPaneTitleBar );
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
connect( ui.searchPane->toggleViewAction(), SIGNAL( triggered( bool ) ),
this, SLOT( updateSearchPaneAndBar( bool ) ) );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( cfg.preferences.searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
groupList = groupListInDock;
translateLine = ui.translateLine;
wordList = ui.wordList;
}
else
{
groupList = groupListInToolbar;
translateLine = translateBox->translateLine();
wordList = translateBox->wordList();
}
Fixed #191: New UI in the scan popup, replace 3 separate widgets with the translate box.
2013-01-25 15:42:44 +00:00
wordList->attachFinder( &wordFinder );
// for the old UI:
ui.wordList->setTranslateLine( ui.translateLine );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList->setFocusPolicy(Qt::ClickFocus);
wordList->setFocusPolicy(Qt::ClickFocus);
wordListDefaultFont = wordList->font();
translateLineDefaultFont = translateLine->font();
// Make the dictionaries pane's titlebar
foundInDictsLabel.setText( tr( "Found in Dictionaries:" ) );
dictsPaneTitleBarLayout.addWidget( &foundInDictsLabel );
Tweaked content margins for dictsPane.
2012-12-27 12:11:11 +00:00
dictsPaneTitleBarLayout.setContentsMargins(5, 5, 5, 5);
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
dictsPaneTitleBar.setLayout( &dictsPaneTitleBarLayout );
Tweaked content margins for dictsPane.
2012-12-27 12:11:11 +00:00
dictsPaneTitleBar.setObjectName("dictsPaneTitleBar");
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
ui.dictsPane->setTitleBarWidget( &dictsPaneTitleBar );
ui.dictsList->setContextMenuPolicy( Qt::CustomContextMenu );
connect( ui.dictsPane, SIGNAL( visibilityChanged( bool ) ),
this, SLOT( dictsPaneVisibilityChanged ( bool ) ) );
connect( ui.dictsList, SIGNAL( itemClicked( QListWidgetItem * ) ),
this, SLOT( foundDictsPaneClicked( QListWidgetItem * ) ) );
connect( ui.dictsList, SIGNAL( customContextMenuRequested( const QPoint & ) ),
this, SLOT( foundDictsContextMenuRequested( const QPoint & ) ) );
added zoom buttons
2009-04-30 19:57:25 +00:00
connect( zoomIn, SIGNAL( triggered() ),
this, SLOT( zoomin() ) );
connect( zoomOut, SIGNAL( triggered() ),
this, SLOT( zoomout() ) );
connect( zoomBase, SIGNAL( triggered() ),
this, SLOT( unzoom() ) );
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
ui.menuZoom->addAction( zoomIn );
ui.menuZoom->addAction( zoomOut );
ui.menuZoom->addAction( zoomBase );
ui.menuZoom->addSeparator();
wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Words Zoom In" ) );
Additional shortcut for ZoomIn/WordsZoomIn actions (Ctrl+= and Alt+=). Browsers do the same for the ZoomIn action, so that it is easier to press with just two button presses instead of three.
2013-01-21 23:01:00 +00:00
wordsZoomIn->setShortcuts( QList< QKeySequence >() <<
QKeySequence( "Alt++" ) <<
QKeySequence( "Alt+=" ) );
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Words Zoom Out" ) );
wordsZoomOut->setShortcut( QKeySequence( "Alt+-" ) );
wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Words Normal Size" ) );
wordsZoomBase->setShortcut( QKeySequence( "Alt+0" ) );
connect( wordsZoomIn, SIGNAL(triggered()), this, SLOT(doWordsZoomIn()) );
connect( wordsZoomOut, SIGNAL(triggered()), this, SLOT(doWordsZoomOut()) );
connect( wordsZoomBase, SIGNAL(triggered()), this, SLOT(doWordsZoomBase()) );
added zoom buttons
2009-04-30 19:57:25 +00:00
// tray icon
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( trayIconMenu.addAction( tr( "Show &Main Window" ) ), SIGNAL( triggered() ),
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
this, SLOT( showMainWindow() ) );
trayIconMenu.addAction( enableScanPopup );
trayIconMenu.addSeparator();
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( trayIconMenu.addAction( tr( "&Quit" ) ), SIGNAL( triggered() ),
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
qApp, SLOT( quit() ) );
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
escAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
escAction.setShortcut( QKeySequence( "Esc" ) );
connect( &escAction, SIGNAL( triggered() ),
this, SLOT( handleEsc() ) );
* Instead of clearing the translation line when pressing Esc, we merely select all its text. This allows both making new query or refining the old one easily.
2009-04-12 22:36:47 +00:00
focusTranslateLineAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
Support some standard shortcuts to get to the translation line (Ctrl+L and Alt+D).
2010-01-13 18:04:39 +00:00
focusTranslateLineAction.setShortcuts( QList< QKeySequence >() <<
QKeySequence( "Alt+D" ) <<
QKeySequence( "Ctrl+L" ) );
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
* Instead of clearing the translation line when pressing Esc, we merely select all its text. This allows both making new query or refining the old one easily.
2009-04-12 22:36:47 +00:00
connect( &focusTranslateLineAction, SIGNAL( triggered() ),
this, SLOT( focusTranslateLine() ) );
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
ui.centralWidget->addAction( &escAction );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
ui.dictsPane->addAction( &escAction );
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
ui.searchPaneWidget->addAction( &escAction );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.historyPane->addAction( &escAction );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList->addAction( &escAction );
Fixed Issue #149: ESC does not work in the input dropdown field of the new UI
2013-01-02 09:55:23 +00:00
translateBox->addAction( &escAction );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
* Instead of clearing the translation line when pressing Esc, we merely select all its text. This allows both making new query or refining the old one easily.
2009-04-12 22:36:47 +00:00
ui.centralWidget->addAction( &focusTranslateLineAction );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
ui.dictsPane->addAction( &focusTranslateLineAction );
* Make the search sidebar into a dock widget.
2009-04-20 13:24:55 +00:00
ui.searchPaneWidget->addAction( &focusTranslateLineAction );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.historyPane->addAction( &focusTranslateLineAction );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList->addAction( &focusTranslateLineAction );
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
addTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
addTabAction.setShortcut( QKeySequence( "Ctrl+T" ) );
added drop-down tab list
2010-09-16 18:52:40 +00:00
// Tab management
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
tabListMenu = new MRUQMenu(tr("Opened tabs"), ui.tabWidget);
connect (tabListMenu, SIGNAL(ctrlReleased()), this, SLOT(ctrlReleased()));
added drop-down tab list
2010-09-16 18:52:40 +00:00
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
connect( &addTabAction, SIGNAL( triggered() ),
this, SLOT( addNewTab() ) );
*! Make tab hotkeys apply to whole main window, not just to its central widget. This makes them work in docklets, too.
2009-04-29 23:55:41 +00:00
addAction( &addTabAction );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) );
added drop-down tab list
2010-09-16 18:52:40 +00:00
closeCurrentTabAction.setText( tr("Close current tab") );
closeCurrentTabAction.setIcon( QIcon(":/icons/closetab.png") );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
connect( &closeCurrentTabAction, SIGNAL( triggered() ),
this, SLOT( closeCurrentTab() ) );
*! Make tab hotkeys apply to whole main window, not just to its central widget. This makes them work in docklets, too.
2009-04-29 23:55:41 +00:00
addAction( &closeCurrentTabAction );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
closeAllTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
closeAllTabAction.setShortcut( QKeySequence( "Ctrl+Shift+W" ) );
closeAllTabAction.setText( tr("Close all tabs") );
connect( &closeAllTabAction, SIGNAL( triggered() ),
this, SLOT( closeAllTabs() ) );
addAction( &closeAllTabAction );
closeRestTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
closeRestTabAction.setText( tr("Close all tabs except current") );
connect( &closeRestTabAction, SIGNAL( triggered() ),
this, SLOT( closeRestTabs() ) );
addAction( &closeRestTabAction );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
switchToNextTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
switchToNextTabAction.setShortcut( QKeySequence( "Ctrl+PgDown" ) );
connect( &switchToNextTabAction, SIGNAL( triggered() ),
this, SLOT( switchToNextTab() ) );
*! Make tab hotkeys apply to whole main window, not just to its central widget. This makes them work in docklets, too.
2009-04-29 23:55:41 +00:00
addAction( &switchToNextTabAction );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
switchToPrevTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
switchToPrevTabAction.setShortcut( QKeySequence( "Ctrl+PgUp" ) );
connect( &switchToPrevTabAction, SIGNAL( triggered() ),
this, SLOT( switchToPrevTab() ) );
*! Make tab hotkeys apply to whole main window, not just to its central widget. This makes them work in docklets, too.
2009-04-29 23:55:41 +00:00
addAction( &switchToPrevTabAction );
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
switchExpandModeAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
switchExpandModeAction.setShortcuts( QList< QKeySequence >() <<
QKeySequence( Qt::CTRL + Qt::Key_8 ) <<
QKeySequence( Qt::CTRL + Qt::Key_Asterisk ) <<
QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_8 ) );
connect( &switchExpandModeAction, SIGNAL( triggered() ),
this, SLOT(switchExpandOptionalPartsMode() ) );
addAction( &switchExpandModeAction );
+ Add 'Show names in dictionary bar' option. This should aid StarDict users since there're no icons in those dictionaries.
2009-10-12 12:41:20 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
tabMenu = new QMenu(this);
tabMenu->addAction( &closeCurrentTabAction );
tabMenu->addAction( &closeRestTabAction );
tabMenu->addSeparator();
tabMenu->addAction( &closeAllTabAction );
// Dictionary bar names
+ Add 'Show names in dictionary bar' option. This should aid StarDict users since there're no icons in those dictionaries.
2009-10-12 12:41:20 +00:00
showDictBarNamesAction.setCheckable( true );
showDictBarNamesAction.setChecked( cfg.showingDictBarNames );
connect( &showDictBarNamesAction, SIGNAL( triggered() ),
this, SLOT( showDictBarNamesTriggered() ) );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
// Use small icons in toolbars
useSmallIconsInToolbarsAction.setCheckable( true );
useSmallIconsInToolbarsAction.setChecked( cfg.usingSmallIconsInToolbars );
connect( &useSmallIconsInToolbarsAction, SIGNAL( triggered() ),
this, SLOT( useSmallIconsInToolbarsTriggered() ) );
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
// Toggle Menubar
toggleMenuBarAction.setCheckable( true );
Proper checkmark for the Menubar action.
2012-12-29 20:24:48 +00:00
toggleMenuBarAction.setChecked( !cfg.preferences.hideMenubar );
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
toggleMenuBarAction.setShortcut( QKeySequence( "Ctrl+M" ) );
connect( &toggleMenuBarAction, SIGNAL( triggered() ),
this, SLOT( toggleMenuBarTriggered() ) );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
// Populate 'View' menu
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
ui.menuView->addAction( &toggleMenuBarAction );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.menuView->addSeparator();
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
ui.menuView->addAction( ui.searchPane->toggleViewAction() );
Added shortcuts for the both sidepanels (Ctrl+S for search, Ctrl+R for results navigation).
2012-12-30 10:06:58 +00:00
ui.searchPane->toggleViewAction()->setShortcut( QKeySequence( "Ctrl+S" ) );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
ui.menuView->addAction( ui.dictsPane->toggleViewAction() );
Added shortcuts for the both sidepanels (Ctrl+S for search, Ctrl+R for results navigation).
2012-12-30 10:06:58 +00:00
ui.dictsPane->toggleViewAction()->setShortcut( QKeySequence( "Ctrl+R" ) );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.menuView->addAction( ui.historyPane->toggleViewAction() );
ui.historyPane->toggleViewAction()->setShortcut( QKeySequence( "Ctrl+H" ) );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
ui.menuView->addSeparator();
ui.menuView->addAction( dictionaryBar.toggleViewAction() );
ui.menuView->addAction( navToolbar->toggleViewAction() );
+ Add 'Show names in dictionary bar' option. This should aid StarDict users since there're no icons in those dictionaries.
2009-10-12 12:41:20 +00:00
ui.menuView->addSeparator();
ui.menuView->addAction( &showDictBarNamesAction );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
ui.menuView->addAction( &useSmallIconsInToolbarsAction );
Implemented "Always on Top" functionality. This feature has been frequently requested by various users.
2012-12-29 11:19:49 +00:00
ui.menuView->addSeparator();
ui.alwaysOnTop->setChecked( cfg.preferences.alwaysOnTop );
ui.menuView->addAction( ui.alwaysOnTop );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
// Dictionary bar
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
if( cfg.lastMainGroupId == Instances::Group::AllGroupId )
{
if( igrp )
igrp->checkMutedDictionaries( &cfg.mutedDictionaries );
dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
}
else
{
Config::Group * grp = cfg.getGroup( cfg.lastMainGroupId );
if( igrp && grp )
igrp->checkMutedDictionaries( &grp->mutedDictionaries );
dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : 0 );
}
+ Add 'Show names in dictionary bar' option. This should aid StarDict users since there're no icons in those dictionaries.
2009-10-12 12:41:20 +00:00
showDictBarNamesTriggered(); // Make update its state according to initial
// setting
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
useSmallIconsInToolbarsTriggered();
Ctrl(Shift)+Click on "Found in dictionaries" pane do same action as on dictionary toolbar
2012-09-19 12:44:36 +00:00
connect( this, SIGNAL( clickOnDictPane( QString const & ) ),
&dictionaryBar, SLOT( dictsPaneClicked( QString const & ) ) );
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
addToolBar( &dictionaryBar );
+! Use the triggered() signal to handle dictionary bar appearance/disappearace events, and only use toggled() one-time to perform first init of the bar, since the initialization appears to be dereffed in time. The use of triggered() instead of toggled() fixes spurious toggling events when the bar is dragged around with the mouse.
2009-09-24 12:20:20 +00:00
connect( dictionaryBar.toggleViewAction(), SIGNAL(triggered(bool)),
this, SLOT(dictionaryBarToggled(bool)) );
// This one will be disconnected once the slot is activated. It exists
// only to handle the initial appearance of the dictionary bar.
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
connect( dictionaryBar.toggleViewAction(), SIGNAL(toggled(bool)),
this, SLOT(dictionaryBarToggled(bool)) );
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
connect( &dictionaryBar, SIGNAL(editGroupRequested()),
this, SLOT(editCurrentGroup()) );
Add "Dictionary info" item to dictionary bar context menu
2012-09-25 13:13:35 +00:00
connect( &dictionaryBar, SIGNAL( showDictionaryInfo( QString const & ) ),
this, SLOT( showDictionaryInfo( QString const & ) ) );
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
connect( &dictionaryBar, SIGNAL( openDictionaryFolder( QString const & ) ),
this, SLOT( openDictionaryFolder( QString const & ) ) );
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
// History
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.historyPaneWidget->setUp( &cfg, &history, ui.menuHistory );
Allow to turn on/off history in preferences
2012-09-11 13:03:10 +00:00
history.enableAdd( cfg.preferences.storeHistory );
Fix a crash when choosing a history item from the menu.
2009-11-01 16:20:26 +00:00
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
connect( ui.historyPaneWidget, SIGNAL( historyItemRequested( QString const & ) ),
this, SLOT( showHistoryItem( QString const & ) ) );
connect( ui.historyPane, SIGNAL( visibilityChanged( bool ) ),
this, SLOT( updateHistoryMenu() ) );
connect( ui.menuHistory, SIGNAL( aboutToShow() ),
this, SLOT( updateHistoryMenu() ) );
+! Don't allow interacting with the tray icon until the program loads fully.
2009-10-09 21:03:55 +00:00
// Show tray icon early so the user would be happy. It won't be functional
// though until the program inits fully.
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+! Don't allow interacting with the tray icon until the program loads fully.
2009-10-09 21:03:55 +00:00
if ( cfg.preferences.enableTrayIcon )
{
trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon.png" ), this );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
trayIcon->setToolTip( tr( "Loading..." ) );
+! Don't allow interacting with the tray icon until the program loads fully.
2009-10-09 21:03:55 +00:00
trayIcon->show();
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( navBack, SIGNAL( triggered() ),
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
this, SLOT( backClicked() ) );
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( navForward, SIGNAL( triggered() ),
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
this, SLOT( forwardClicked() ) );
addTab.setAutoRaise( true );
tooltips for a couple of buttons
2011-07-10 10:29:52 +00:00
addTab.setToolTip( tr( "New Tab" ) );
Cleanup of the focus order. Some non-essential components should never get keyboard focus. So, now the focus order is as follows: TranslateLine -> TabWidget -> ArticleView -> DictsList, nothing else.
2011-06-28 15:55:41 +00:00
addTab.setFocusPolicy(Qt::ClickFocus);
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
addTab.setIcon( QIcon( ":/icons/addtab.png" ) );
Hide single tab option is implemented. By default, it's turned off (== current behavior).
2011-06-23 14:17:09 +00:00
ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.tabWidget->clear();
ui.tabWidget->setCornerWidget( &addTab, Qt::TopLeftCorner );
//ui.tabWidget->setCornerWidget( &closeTab, Qt::TopRightCorner );
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
#if QT_VERSION >= 0x040500
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.tabWidget->setMovable( true );
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
#endif
#ifndef Q_OS_WIN32
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.tabWidget->setDocumentMode( true );
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
ui.tabWidget->setContextMenuPolicy( Qt::CustomContextMenu );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
connect( &addTab, SIGNAL( clicked() ),
this, SLOT( addNewTab() ) );
Fixed #28: Allow adding a new tab by double-clicking the large empty space right to it
2011-07-19 10:03:13 +00:00
connect( ui.tabWidget, SIGNAL( doubleClicked() ),
this, SLOT( addNewTab() ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
connect( ui.tabWidget, SIGNAL( tabCloseRequested( int ) ),
this, SLOT( tabCloseRequested( int ) ) );
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
connect( ui.tabWidget, SIGNAL( currentChanged( int ) ),
this, SLOT( tabSwitched( int ) ) );
added drop-down tab list
2010-09-16 18:52:40 +00:00
connect( ui.tabWidget, SIGNAL( customContextMenuRequested(QPoint)) ,
this, SLOT( tabMenuRequested(QPoint)) );
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
#if QT_VERSION >= 0x040500
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.tabWidget->setTabsClosable( true );
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.quit, SIGNAL( triggered() ),
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
qApp, SLOT( quit() ) );
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.dictionaries, SIGNAL( triggered() ),
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
this, SLOT( editDictionaries() ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.preferences, SIGNAL( triggered() ),
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
this, SLOT( editPreferences() ) );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.visitHomepage, SIGNAL( triggered() ),
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
this, SLOT( visitHomepage() ) );
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.visitForum, SIGNAL( triggered() ),
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
this, SLOT( visitForum() ) );
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.openConfigFolder, SIGNAL( triggered() ),
New menu item: Help -> Configuration Folder. I'm tired of explaining to users where their configuration folder for GoldenDict is. :)
2011-07-10 07:36:43 +00:00
this, SLOT( openConfigFolder() ) );
Second part of renamings activated() -> triggered(). Using triggered() is a proper Qt 4.* way.
2012-12-04 08:33:47 +00:00
connect( ui.about, SIGNAL( triggered() ),
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
this, SLOT( showAbout() ) );
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
connect( groupListInDock, SIGNAL( currentIndexChanged( QString const & ) ),
this, SLOT( currentGroupChanged( QString const & ) ) );
connect( groupListInToolbar, SIGNAL( currentIndexChanged( QString const & ) ),
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
this, SLOT( currentGroupChanged( QString const & ) ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
connect( ui.translateLine, SIGNAL( textChanged( QString const & ) ),
this, SLOT( translateInputChanged( QString const & ) ) );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
connect( translateBox->translateLine(), SIGNAL( textChanged( QString const & ) ),
this, SLOT( translateInputChanged( QString const & ) ) );
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
connect( ui.translateLine, SIGNAL( returnPressed() ),
this, SLOT( translateInputFinished() ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
connect( translateBox->translateLine(), SIGNAL( returnPressed() ),
this, SLOT( translateInputFinished() ) );
Fixed regression #141.
2012-12-24 21:56:31 +00:00
connect( ui.wordList, SIGNAL( itemSelectionChanged() ),
this, SLOT( wordListSelectionChanged() ) );
connect( translateBox->wordList(), SIGNAL( itemDoubleClicked ( QListWidgetItem * ) ),
this, SLOT( wordListItemActivated( QListWidgetItem * ) ) );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
connect( ui.wordList, SIGNAL( itemClicked( QListWidgetItem * ) ),
this, SLOT( wordListItemActivated( QListWidgetItem * ) ) );
Fixed #191: New UI in the scan popup, replace 3 separate widgets with the translate box.
2013-01-25 15:42:44 +00:00
connect( ui.wordList, SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ),
this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) );
connect( translateBox->wordList(), SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ),
this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
connect( ui.dictsList, SIGNAL( itemSelectionChanged() ),
this, SLOT( dictsListSelectionChanged() ) );
Jump to article when double-clicking on dictinary in "Found in Dictionaries" This forces the jump even when the dictionary is already a current/active dictionary. This is convenient for the following use-cases: 1. User manually scrolls far away from the current dictionary and would like to return. 2. User jumps far away from the current dictionary when doing search (Ctrl+F). 3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 16:00:13 +00:00
connect( ui.dictsList, SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
this, SLOT( dictsListItemActivated( QListWidgetItem * ) ) );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
connect( &configEvents, SIGNAL( mutedDictionariesChanged() ),
this, SLOT( mutedDictionariesChanged() ) );
Fixed issue #144: wordlist suggestions stay on the screen even when the window is moved/resized.
2012-12-25 09:25:54 +00:00
this->installEventFilter( this );
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
ui.translateLine->installEventFilter( this );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateBox->translateLine()->installEventFilter( this );
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
ui.wordList->installEventFilter( this );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateBox->wordList()->installEventFilter( this );
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
ui.wordList->viewport()->installEventFilter( this );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateBox->wordList()->viewport()->installEventFilter( this );
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
ui.dictsList->installEventFilter( this );
ui.dictsList->viewport()->installEventFilter( this );
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
//tabWidget doesn't propagate Ctrl+Tab to the parent widget unless event filter is installed
ui.tabWidget->installEventFilter( this );
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
ui.historyList->installEventFilter( this );
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#ifdef Q_OS_WIN
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
QRect baseGeometry;
if( cfg.maximizedMainWindowGeometry.width() > 0 )
{
if ( cfg.mainWindowGeometry.size() )
restoreGeometry( cfg.mainWindowGeometry );
baseGeometry = geometry();
setGeometry( cfg.maximizedMainWindowGeometry );
if ( cfg.mainWindowState.size() )
restoreState( cfg.mainWindowState, 1 );
setWindowState( windowState() | Qt::WindowMaximized );
}
else
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#endif
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
{
if ( cfg.mainWindowGeometry.size() )
restoreGeometry( cfg.mainWindowGeometry );
if ( cfg.mainWindowState.size() )
restoreState( cfg.mainWindowState, 1 );
}
+ Save main window's state and geometry on exit and restore it back on startup.
2009-04-03 21:24:07 +00:00
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
updateSearchPaneAndBar( cfg.preferences.searchInDock );
ui.searchPane->setVisible( cfg.preferences.searchInDock );
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
applyProxySettings();
Add a "Enable web plugins" option under Edit > Preferences > Network. It allows to listen to sound pronunciations from online dictionaries that rely on flash plugin such as howjsay.com and dictionary.com. Plugin must be installed for this option to work. See http://doc.trolltech.com/4.5/qtwebkit.html#netscape-plugin-support
2011-05-08 21:19:08 +00:00
applyWebSettings();
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
makeDictionaries();
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
// After we have dictionaries and groups, we can populate history
Large search history
2012-02-16 14:56:25 +00:00
// historyChanged();
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
Don't translate program name
2013-02-01 12:36:01 +00:00
setWindowTitle( "GoldenDict" );
Don't show welcome page header in window title (issue #195)
2013-01-31 13:01:08 +00:00
blockUpdateWindowTitle = true;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
addNewTab();
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
// Create tab list menu
createTabList();
+ Add some initial welcome text and help.
2009-02-08 18:35:29 +00:00
// Show the initial welcome text
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
+ Add some initial welcome text and help.
2009-02-08 18:35:29 +00:00
Do not store the welcome page in the user history.
2013-01-20 18:25:12 +00:00
history.enableAdd( false );
Don't show welcome page header in window title (issue #195)
2013-01-31 13:01:08 +00:00
blockUpdateWindowTitle = true;
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->showDefinition( tr( "Welcome!" ), Instances::Group::HelpGroupId );
Do not store the welcome page in the user history.
2013-01-20 18:25:12 +00:00
history.enableAdd( cfg.preferences.storeHistory );
+ Add some initial welcome text and help.
2009-02-08 18:35:29 +00:00
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setFocus();
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
+! Don't allow interacting with the tray icon until the program loads fully.
2009-10-09 21:03:55 +00:00
if ( trayIcon )
{
// Upgrade existing dummy tray icon into a full-functional one
trayIcon->setContextMenu( &trayIconMenu );
trayIcon->show();
connect( trayIcon, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ),
this, SLOT( trayIconActivated( QSystemTrayIcon::ActivationReason ) ) );
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
updateTrayIcon();
some polishing of zooming routines
2009-04-30 22:09:04 +00:00
// Update zoomers
applyZoomFactor();
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
applyWordsZoomLevel();
some polishing of zooming routines
2009-04-30 22:09:04 +00:00
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
// Update autostart info
setAutostart(cfg.preferences.autoStart);
updated (added libqxt and global shortcut Ctrl-F11; fixed issue with autostart on Vista)
2009-04-19 21:32:18 +00:00
// Initialize global hotkeys
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
installHotKeys();
updated (added libqxt and global shortcut Ctrl-F11; fixed issue with autostart on Vista)
2009-04-19 21:32:18 +00:00
Implemented "Always on Top" functionality. This feature has been frequently requested by various users.
2012-12-29 11:19:49 +00:00
if ( cfg.preferences.alwaysOnTop )
{
on_alwaysOnTop_triggered( true );
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
// Only show window initially if it wasn't configured differently
if ( !cfg.preferences.enableTrayIcon || !cfg.preferences.startToTray )
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
{
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
show();
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
focusTranslateLine();
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#ifdef Q_OS_WIN
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
if( baseGeometry.width() > 0 )
{
hide();
setGeometry( baseGeometry );
showMaximized();
Win-specific: activate main window after geometry adjusting at program start
2013-02-21 12:56:28 +00:00
activateWindow();
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
}
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#endif
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
}
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
connect( &newReleaseCheckTimer, SIGNAL( timeout() ),
this, SLOT( checkForNewRelease() ) );
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
if ( cfg.preferences.hideMenubar )
{
toggleMenuBarTriggered( false );
}
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
prepareNewReleaseChecks();
* On initial load do deferred dictionary init at the very end.
2009-05-17 22:02:54 +00:00
// makeDictionaries() didn't do deferred init - we do it here, at the end.
doDeferredInit( dictionaries );
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
updateStatusLine();
Added full-screen mode for Mac OS X Lion Adapted from https://github.com/bjorn/tiled/tree/master/src/tiled
2012-06-03 18:29:49 +00:00
Mac-specific: Check Accessibility API at start with auto scan popup (issue #129)
2013-04-12 14:30:24 +00:00
#ifdef Q_OS_MACX
if( cfg.preferences.startWithScanPopupOn && !AXAPIEnabled() )
mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
QPixmap( ":/icons/error.png" ) );
#endif
Properly restore main window maximized state when it activated through tray icon
2013-01-23 20:36:53 +00:00
wasMaximized = isMaximized();
Periodical save of history (issue #209)
2013-02-05 12:51:23 +00:00
history.setSaveInterval( cfg.preferences.historyStoreInterval );
Added full-screen mode for Mac OS X Lion Adapted from https://github.com/bjorn/tiled/tree/master/src/tiled
2012-06-03 18:29:49 +00:00
#ifdef Q_OS_MAC
LionSupport::addFullscreen(this);
#endif
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#ifdef Q_OS_WIN32
gdAskMessage = RegisterWindowMessage( GD_MESSAGE_NAME );
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
void MainWindow::ctrlTabPressed()
{
emit fillWindowsMenu();
tabListButton->click();
}
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
void MainWindow::updateSearchPaneAndBar( bool searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
Fixed #188: Switching the UI mode should focus the translate line and update it.
2013-01-23 19:11:39 +00:00
QString text = translateLine->text();
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
cfg.preferences.searchInDock = true;
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
Fixed #176: Menu button is not centered when toolbar is vertically positioned. We just disable the Left and Right areas for the main toolbar in the new UI mode. :)
2013-01-21 20:50:57 +00:00
navToolbar->setAllowedAreas( Qt::AllToolBarAreas );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList = groupListInDock;
translateLine = ui.translateLine;
wordList = ui.wordList;
Fixed #205: Visual glitches in the new UI on KDE/Linux.
2013-02-07 15:24:24 +00:00
translateBoxToolBarAction->setVisible( false );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
}
else
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
cfg.preferences.searchInDock = false;
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
Fixed #176: Menu button is not centered when toolbar is vertically positioned. We just disable the Left and Right areas for the main toolbar in the new UI mode. :)
2013-01-21 20:50:57 +00:00
// handle the main toolbar, it must not be on the side, since it should
// contain the group widget and the translate line. Valid locations: Top and Bottom.
navToolbar->setAllowedAreas( Qt::BottomToolBarArea | Qt::TopToolBarArea );
if ( toolBarArea( navToolbar ) & ( Qt::LeftToolBarArea | Qt::RightToolBarArea ) )
{
if ( toolBarArea( &dictionaryBar ) == Qt::TopToolBarArea )
{
insertToolBar( &dictionaryBar, navToolbar );
}
else
{
addToolBar( Qt::TopToolBarArea, navToolbar );
}
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList = groupListInToolbar;
translateLine = translateBox->translateLine();
wordList = translateBox->wordList();
Fixed #205: Visual glitches in the new UI on KDE/Linux.
2013-02-07 15:24:24 +00:00
translateBoxToolBarAction->setVisible( true );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
}
Fixed #215: Enter doesn't work in the suggestions list when switching from the Old UI.
2013-02-08 17:09:37 +00:00
// reset the flag when switching UI modes
wordListSelChanged = false;
Fixed #191: New UI in the scan popup, replace 3 separate widgets with the translate box.
2013-01-25 15:42:44 +00:00
wordList->attachFinder( &wordFinder );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
updateGroupList();
Fixed #178: Word Zoom Level is not preserved when switching UI modes (Ctrl+S).
2013-01-21 21:49:58 +00:00
applyWordsZoomLevel();
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
if ( cfg.preferences.searchInDock )
translateLine->setText( text );
else
translateBox->setText( text, false );
Fixed #188: Switching the UI mode should focus the translate line and update it.
2013-01-23 19:11:39 +00:00
focusTranslateLine();
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
}
The following patches made by Dmitry E. Oboukhov applied: * Middle click on the tray icon translates current selection * Middle click on the main window also translates current selection * When editing groups, double click on the dictionary adds it to the current group.
2009-07-31 11:40:54 +00:00
void MainWindow::mousePressEvent( QMouseEvent *event)
{
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
if (handleBackForwardMouseButtons( event ) )
{
return;
}
added drop-down tab list
2010-09-16 18:52:40 +00:00
if (event->button() != Qt::MidButton)
return QMainWindow::mousePressEvent(event);
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
// middle clicked
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
QString subtype = "plain";
added drop-down tab list
2010-09-16 18:52:40 +00:00
QString str = QApplication::clipboard()->text(subtype,
QClipboard::Selection);
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setText(str);
The following patches made by Dmitry E. Oboukhov applied: * Middle click on the tray icon translates current selection * Middle click on the main window also translates current selection * When editing groups, double click on the dictionary adds it to the current group.
2009-07-31 11:40:54 +00:00
Deal with X11 headers mess that causes compilation errors
2011-06-09 07:29:21 +00:00
QKeyEvent ev(QEvent::KeyPress, Qt::Key_Enter,
added drop-down tab list
2010-09-16 18:52:40 +00:00
Qt::NoModifier);
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
QApplication::sendEvent(translateLine, &ev);
The following patches made by Dmitry E. Oboukhov applied: * Middle click on the tray icon translates current selection * Middle click on the main window also translates current selection * When editing groups, double click on the dictionary adds it to the current group.
2009-07-31 11:40:54 +00:00
}
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
MainWindow::~MainWindow()
{
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#ifdef Q_OS_WIN
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
if( isMaximized() )
cfg.maximizedMainWindowGeometry = geometry();
else
cfg.maximizedMainWindowGeometry = QRect();
Make changes from commit d8decdae83 Win-specific (issue #213)
2013-02-04 14:10:37 +00:00
#endif
Properly save/restore main window configuration when it maximized
2013-01-29 19:20:53 +00:00
*! Fix some problems with dictionary order handling (duplicates etc). +! Close all tabs before quitting - this fixes segfaults due to out-of-order destructions.
2009-05-23 14:19:57 +00:00
// Close all tabs -- they should be destroyed before network managers
// do.
while( ui.tabWidget->count() )
{
QWidget * w = ui.tabWidget->widget( 0 );
ui.tabWidget->removeTab( 0 );
delete w;
}
Large search history
2012-02-16 14:56:25 +00:00
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
commitData();
Large search history
2012-02-16 14:56:25 +00:00
history.save();
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
}
Properly handle QApplication::commitData(), hopefully providing proper config file saving when the system shuts down.
2010-06-28 15:14:07 +00:00
void MainWindow::commitData( QSessionManager & )
{
commitData();
}
void MainWindow::commitData()
{
if ( !commitDataCompleted )
{
commitDataCompleted = true;
// Save MainWindow state and geometry
cfg.mainWindowState = saveState( 1 );
cfg.mainWindowGeometry = saveGeometry();
// Close the popup, so it would save its geometry to config
scanPopup.reset();
// Save any changes in last chosen groups etc
Config::save( cfg );
}
}
Construct printer only when the first printing operation is requested. This speeds up startup and conserves resources, since apparently creating a printer makes it connect to localhost:ipp and do other things. While at it, use high-resolution printing mode instead of the default, which is a screen resolution.
2009-11-11 09:40:32 +00:00
QPrinter & MainWindow::getPrinter()
{
if ( printer.get() )
return *printer;
printer = new QPrinter( QPrinter::HighResolution );
return *printer;
}
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
void MainWindow::applyQtStyleSheet( QString const & displayStyle, QString const & addonStyle )
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
{
QFile builtInCssFile( ":/qt-style.css" );
builtInCssFile.open( QFile::ReadOnly );
QByteArray css = builtInCssFile.readAll();
Fixed #254: Mac OS X: TranslateBox alignment issues
2013-04-01 16:37:44 +00:00
#if defined(Q_OS_MAC)
QFile macCssFile( ":/qt-style-macos.css" );
macCssFile.open( QFile::ReadOnly );
css += macCssFile.readAll();
#endif
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
if ( displayStyle.size() )
{
// Load an additional stylesheet
QFile builtInCssFile( QString( ":/qt-style-st-%1.css" ).arg( displayStyle ) );
builtInCssFile.open( QFile::ReadOnly );
css += builtInCssFile.readAll();
}
// Try loading a style sheet if there's one
QFile cssFile( Config::getUserQtCssFileName() );
if ( cssFile.open( QFile::ReadOnly ) )
css += cssFile.readAll();
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
if( !addonStyle.isEmpty() )
{
QString name = Config::getStylesDir() + addonStyle
+ QDir::separator() + "qt-style.css";
QFile addonCss( name );
if( addonCss.open( QFile::ReadOnly ) )
css += addonCss.readAll();
}
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
setStyleSheet( css );
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
void MainWindow::updateTrayIcon()
{
if ( !trayIcon && cfg.preferences.enableTrayIcon )
{
// Need to show it
trayIcon = new QSystemTrayIcon( QIcon( ":/icons/programicon.png" ), this );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
trayIcon->setContextMenu( &trayIconMenu );
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
trayIcon->show();
connect( trayIcon, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ),
this, SLOT( trayIconActivated( QSystemTrayIcon::ActivationReason ) ) );
}
else
if ( trayIcon && !cfg.preferences.enableTrayIcon )
{
// Need to hide it
delete trayIcon;
trayIcon = 0;
}
if ( trayIcon )
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
{
// Update the icon to reflect the scanning mode
trayIcon->setIcon( QIcon(
enableScanPopup->isChecked() ?
":/icons/programicon_scan.png" :
":/icons/programicon.png" ) );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
trayIcon->setToolTip( "GoldenDict" );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
}
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
// The 'Close to tray' action is associated with the tray icon, so we hide
// or show it here.
ui.actionCloseToTray->setVisible( cfg.preferences.enableTrayIcon );
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
}
Zoom in/out with Ctrl + Scroll wheel This is standard behavior in pretty much any modern application (Notepad, Explorer, PDF reader and all browsers).
2013-01-01 23:05:29 +00:00
void MainWindow::wheelEvent( QWheelEvent *ev )
{
if ( ev->modifiers().testFlag( Qt::ControlModifier ) )
{
if ( ev->delta() > 0 )
{
zoomin();
}
else if ( ev->delta() < 0 )
{
zoomout();
}
ev->accept();
}
else
{
ev->ignore();
}
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
void MainWindow::closeEvent( QCloseEvent * ev )
{
if ( cfg.preferences.enableTrayIcon && cfg.preferences.closeToTray )
{
ev->ignore();
hide();
}
else
Prevent program from quitting spontaneously when it works with scan popup and the main window is closed.
2010-05-08 13:57:41 +00:00
{
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
ev->accept();
Prevent program from quitting spontaneously when it works with scan popup and the main window is closed.
2010-05-08 13:57:41 +00:00
qApp->quit();
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
}
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
void MainWindow::applyProxySettings()
{
*! Fix proxy problems by constructing it with the right type from the start. Squid now works.
2009-04-13 17:31:05 +00:00
QNetworkProxy::ProxyType type = QNetworkProxy::NoProxy;
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
*! Fix proxy problems by constructing it with the right type from the start. Squid now works.
2009-04-13 17:31:05 +00:00
if ( cfg.preferences.proxyServer.enabled )
{
switch( cfg.preferences.proxyServer.type )
{
case Config::ProxyServer::Socks5:
type = QNetworkProxy::Socks5Proxy;
break;
case Config::ProxyServer::HttpConnect:
type = QNetworkProxy::HttpProxy;
break;
case Config::ProxyServer::HttpGet:
type = QNetworkProxy::HttpCachingProxy;
break;
default:
break;
}
}
QNetworkProxy proxy( type );
if ( cfg.preferences.proxyServer.enabled )
{
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
proxy.setHostName( cfg.preferences.proxyServer.host );
proxy.setPort( cfg.preferences.proxyServer.port );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
if ( cfg.preferences.proxyServer.user.size() )
proxy.setUser( cfg.preferences.proxyServer.user );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
if ( cfg.preferences.proxyServer.password.size() )
proxy.setPassword( cfg.preferences.proxyServer.password );
*! Fix proxy problems by constructing it with the right type from the start. Squid now works.
2009-04-13 17:31:05 +00:00
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
*! Fix proxy problems by constructing it with the right type from the start. Squid now works.
2009-04-13 17:31:05 +00:00
QNetworkProxy::setApplicationProxy( proxy );
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
}
Add a "Enable web plugins" option under Edit > Preferences > Network. It allows to listen to sound pronunciations from online dictionaries that rely on flash plugin such as howjsay.com and dictionary.com. Plugin must be installed for this option to work. See http://doc.trolltech.com/4.5/qtwebkit.html#netscape-plugin-support
2011-05-08 21:19:08 +00:00
void MainWindow::applyWebSettings()
{
QWebSettings *defaultSettings = QWebSettings::globalSettings();
defaultSettings->setAttribute(QWebSettings::PluginsEnabled, cfg.preferences.enableWebPlugins);
Add "Inspect" action to context menu * The "Inspect" action will bring up web inspector from WebKit. * Restorable inspector window geometry.
2013-05-30 02:18:28 +00:00
defaultSettings->setAttribute( QWebSettings::DeveloperExtrasEnabled, true );
Add a "Enable web plugins" option under Edit > Preferences > Network. It allows to listen to sound pronunciations from online dictionaries that rely on flash plugin such as howjsay.com and dictionary.com. Plugin must be installed for this option to work. See http://doc.trolltech.com/4.5/qtwebkit.html#netscape-plugin-support
2011-05-08 21:19:08 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void MainWindow::makeDictionaries()
{
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
scanPopup.reset();
wordFinder.clear();
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
dictionariesUnmuted.clear();
* On initial load do deferred dictionary init at the very end.
2009-05-17 22:02:54 +00:00
loadDictionaries( this, isVisible(), cfg, dictionaries, dictNetMgr, false );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
updateStatusLine();
updateGroupList();
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
makeScanPopup();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::updateStatusLine()
{
unsigned articleCount = 0, wordCount = 0;
for( unsigned x = dictionaries.size(); x--; )
{
articleCount += dictionaries[ x ]->getArticleCount();
wordCount += dictionaries[ x ]->getWordCount();
}
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
mainStatusBar->showMessage( tr( "%1 dictionaries, %2 articles, %3 words" ).
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
arg( dictionaries.size() ).arg( articleCount ).
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
arg( wordCount ), 10000 );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::updateGroupList()
{
bool haveGroups = cfg.groups.size();
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList->setVisible( haveGroups );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Incorporate group selector into the search pane's titlebar, replacing the original with it.
2009-04-20 14:13:39 +00:00
groupLabel.setText( haveGroups ? tr( "Look up in:" ) : tr( "Look up:" ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
// currentIndexChanged() signal is very trigger-happy. To avoid triggering
// it, we disconnect it while we're clearing and filling back groups.
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
disconnect( groupList, SIGNAL( currentIndexChanged( QString const & ) ),
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
this, SLOT( currentGroupChanged( QString const & ) ) );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
groupInstances.clear();
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
// Add dictionaryOrder first, as the 'All' group.
+ Make groups resistant to losing dictionaries when they got moved or otherwise change their ids by saving their names, too, and falling back to matching each group dictionary against name instead of id when no ids match.
2009-04-01 12:00:28 +00:00
{
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
Instances::Group g( cfg.dictionaryOrder, dictionaries );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
*! Fix some problems with dictionary order handling (duplicates etc). +! Close all tabs before quitting - this fixes segfaults due to out-of-order destructions.
2009-05-23 14:19:57 +00:00
// Add any missing entries to dictionary order
Instances::complementDictionaryOrder( g,
Instances::Group( cfg.inactiveDictionaries, dictionaries ),
dictionaries );
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
g.name = tr( "All" );
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
g.id = Instances::Group::AllGroupId;
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
g.icon = "folder.png";
groupInstances.push_back( g );
+ Make groups resistant to losing dictionaries when they got moved or otherwise change their ids by saving their names, too, and falling back to matching each group dictionary against name instead of id when no ids match.
2009-04-01 12:00:28 +00:00
}
std::vector -> QVector in config
2012-12-10 12:49:45 +00:00
for( int x = 0; x < cfg.groups.size(); ++x )
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
groupInstances.push_back( Instances::Group( cfg.groups[ x ], dictionaries ) );
// Update names for dictionaries that are present, so that they could be
// found in case they got moved.
Instances::updateNames( cfg, dictionaries );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList->fill( groupInstances );
groupList->setCurrentGroup( cfg.lastMainGroupId );
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
updateCurrentGroupProperty();
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
updateDictionaryBar();
Reload the open tabs when groups and dictionary order is changed
2013-06-10 21:39:40 +00:00
qDebug() << "Reloading all the tabs...";
for( int i = 0; i < ui.tabWidget->count(); ++i )
{
ArticleView & view =
dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( i ) ) );
view.reload();
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
connect( groupList, SIGNAL( currentIndexChanged( QString const & ) ),
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
this, SLOT( currentGroupChanged( QString const & ) ) );
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
void MainWindow::updateDictionaryBar()
{
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
if ( !dictionaryBar.toggleViewAction()->isChecked() )
return; // It's not enabled, therefore hidden -- don't waste time
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
unsigned currentId = groupList -> getCurrentGroup();
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
Instances::Group * grp = groupInstances.findGroup( currentId );
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
Fix crash in some cases after new group adding
2012-11-17 08:20:18 +00:00
dictionaryBar.setMutedDictionaries( 0 );
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
if ( grp ) { // Should always be !0, but check as a safeguard
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
if( currentId == Instances::Group::AllGroupId )
dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
else
{
Config::Group * grp = cfg.getGroup( currentId );
dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : 0 );
}
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
Fix crash in some cases after new group adding
2012-11-17 08:20:18 +00:00
dictionaryBar.setDictionaries( grp->dictionaries );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
if ( useSmallIconsInToolbarsAction.isChecked() ) {
int extent = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
Dictionary bar icons size when small icons selected
2012-11-07 15:18:56 +00:00
dictionaryBar.setDictionaryIconSize( extent );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
}
}
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
}
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
void MainWindow::makeScanPopup()
{
scanPopup.reset();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
if ( !cfg.preferences.enableScanPopup &&
!cfg.preferences.enableClipboardHotkey )
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
return;
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
scanPopup = new ScanPopup( 0, cfg, articleNetMgr, dictionaries, groupInstances,
history );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
scanPopup->setStyleSheet( styleSheet() );
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
if ( cfg.preferences.enableScanPopup && enableScanPopup->isChecked() )
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
scanPopup->enableScanning();
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
connect( scanPopup.get(), SIGNAL(editGroupRequested( unsigned ) ),
this, SLOT(editDictionaries( unsigned )), Qt::QueuedConnection );
connect( scanPopup.get(), SIGNAL(sendWordToMainWindow( QString const & ) ),
this, SLOT(wordReceived( QString const & )), Qt::QueuedConnection );
connect( this, SIGNAL( setExpandOptionalParts( bool ) ),
scanPopup.get(), SIGNAL( setViewExpandMode( bool ) ) );
connect( scanPopup.get(), SIGNAL( setExpandMode( bool ) ),
this, SLOT( setExpandMode( bool ) ) );
Add word to history via context menu from ScapPopup window
2012-09-16 10:30:14 +00:00
connect( scanPopup.get(), SIGNAL( forceAddWordToHistory( const QString & ) ),
this, SLOT( forceAddWordToHistory( const QString & ) ) );
Win-specific: Show translation in popup window istead of sending word to GD main window while scanning GD main window
2012-09-24 13:20:58 +00:00
Add "Dictionary info" item to dictionary bar context menu
2012-09-25 13:13:35 +00:00
connect( scanPopup.get(), SIGNAL( showDictionaryInfo( const QString & ) ),
this, SLOT( showDictionaryInfo( const QString & ) ) );
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
connect( scanPopup.get(), SIGNAL( openDictionaryFolder( const QString & ) ),
this, SLOT( openDictionaryFolder( const QString & ) ) );
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
connect( scanPopup.get(), SIGNAL( sendWordToHistory( QString ) ),
this, SLOT( addWordToHistory( QString ) ) );
Win-specific: Show translation in popup window istead of sending word to GD main window while scanning GD main window
2012-09-24 13:20:58 +00:00
#ifdef Q_OS_WIN32
connect( scanPopup.get(), SIGNAL( isGoldenDictWindow( HWND ) ),
this, SLOT( isGoldenDictWindow( HWND ) ) );
#endif
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts()
added drop-down tab list
2010-09-16 18:52:40 +00:00
{
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
if ( groupInstances.empty() )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
return dictionaries;
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
int current = groupList->currentIndex();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
if ( current < 0 || current >= (int) groupInstances.size() )
{
// This shouldn't ever happen
return dictionaries;
}
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
Config::MutedDictionaries const * mutedDictionaries = dictionaryBar.getMutedDictionaries();
if ( !dictionaryBar.toggleViewAction()->isChecked() || mutedDictionaries == 0 )
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
return groupInstances[ current ].dictionaries;
else
{
vector< sptr< Dictionary::Class > > const & activeDicts =
groupInstances[ current ].dictionaries;
// Populate the special dictionariesUnmuted array with only unmuted
// dictionaries
dictionariesUnmuted.clear();
dictionariesUnmuted.reserve( activeDicts.size() );
for( unsigned x = 0; x < activeDicts.size(); ++x )
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
if ( !mutedDictionaries->contains(
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
QString::fromStdString( activeDicts[ x ]->getId() ) ) )
dictionariesUnmuted.push_back( activeDicts[ x ] );
return dictionariesUnmuted;
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
added drop-down tab list
2010-09-16 18:52:40 +00:00
void MainWindow::createTabList()
{
tabListMenu->setIcon(QIcon(":/icons/windows-list.png"));
connect(tabListMenu, SIGNAL(aboutToShow()), this, SLOT(fillWindowsMenu()));
connect(tabListMenu, SIGNAL(triggered(QAction*)), this, SLOT(switchToWindow(QAction*)));
tabListButton = new QToolButton(ui.tabWidget);
tabListButton->setAutoRaise(true);
tabListButton->setIcon(tabListMenu->icon());
tabListButton->setMenu(tabListMenu);
tooltips for a couple of buttons
2011-07-10 10:29:52 +00:00
tabListButton->setToolTip( tr( "Open Tabs List" ) );
added drop-down tab list
2010-09-16 18:52:40 +00:00
tabListButton->setPopupMode(QToolButton::InstantPopup);
ui.tabWidget->setCornerWidget(tabListButton);
Cleanup of the focus order. Some non-essential components should never get keyboard focus. So, now the focus order is as follows: TranslateLine -> TabWidget -> ArticleView -> DictsList, nothing else.
2011-06-28 15:55:41 +00:00
tabListButton->setFocusPolicy(Qt::ClickFocus);
added drop-down tab list
2010-09-16 18:52:40 +00:00
}
void MainWindow::fillWindowsMenu()
{
tabListMenu->clear();
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
if(cfg.preferences.mruTabOrder)
added drop-down tab list
2010-09-16 18:52:40 +00:00
{
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
for (int i = 0; i < mruList.count(); i++)
added drop-down tab list
2010-09-16 18:52:40 +00:00
{
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
QAction *act = tabListMenu->addAction(ui.tabWidget->tabIcon(ui.tabWidget->indexOf(mruList.at(i))), ui.tabWidget->tabText(ui.tabWidget->indexOf(mruList.at(i))));
//remember the index of the Tab to be later used in ctrlReleased()
act->setData(ui.tabWidget->indexOf(mruList.at(i)));
if (ui.tabWidget->currentIndex() == ui.tabWidget->indexOf(mruList.at(i)))
{
QFont f( act->font() );
f.setBold( true );
act->setFont( f );
}
}
if (tabListMenu->actions().size() > 1)
{
tabListMenu->setActiveAction(tabListMenu->actions().at(1));
added drop-down tab list
2010-09-16 18:52:40 +00:00
}
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
else
added drop-down tab list
2010-09-16 18:52:40 +00:00
{
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
for (int i = 0; i < ui.tabWidget->count(); i++)
added drop-down tab list
2010-09-16 18:52:40 +00:00
{
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
QAction *act = tabListMenu->addAction( ui.tabWidget->tabIcon( i ),
ui.tabWidget->tabText( i ) );
act->setData( i );
if (ui.tabWidget->currentIndex() == i)
{
QFont f( act->font() );
f.setBold( true );
act->setFont( f );
}
added drop-down tab list
2010-09-16 18:52:40 +00:00
}
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
return;
added drop-down tab list
2010-09-16 18:52:40 +00:00
}
void MainWindow::switchToWindow(QAction *act)
{
int idx = act->data().toInt();
ui.tabWidget->setCurrentIndex(idx);
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void MainWindow::addNewTab()
+ Options to open tabs in background and open tabs after the current one added.
2009-04-13 12:51:25 +00:00
{
createNewTab( true, tr( "(untitled)" ) );
}
ArticleView * MainWindow::createNewTab( bool switchToIt,
QString const & name )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
+ Add 'table of contents' navigation into the right-button mouse menu.
2009-04-12 16:22:42 +00:00
ArticleView * view = new ArticleView( this, articleNetMgr, dictionaries,
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
groupInstances, false, cfg,
dictionaryBar.toggleViewAction(),
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupList );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
connect( view, SIGNAL( titleChanged( ArticleView *, QString const & ) ),
this, SLOT( titleChanged( ArticleView *, QString const & ) ) );
connect( view, SIGNAL( iconChanged( ArticleView *, QIcon const & ) ),
this, SLOT( iconChanged( ArticleView *, QIcon const & ) ) );
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
connect( view, SIGNAL( pageLoaded( ArticleView * ) ),
this, SLOT( pageLoaded( ArticleView * ) ) );
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
connect( view, SIGNAL( openLinkInNewTab( QUrl const &, QUrl const &, QString const &, ArticleView::Contexts const & ) ),
this, SLOT( openLinkInNewTab( QUrl const &, QUrl const &, QString const &, ArticleView::Contexts const & ) ) );
+ Options to open tabs in background and open tabs after the current one added.
2009-04-13 12:51:25 +00:00
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
connect( view, SIGNAL( showDefinitionInNewTab( QString const &, unsigned, QString const &, ArticleView::Contexts const & ) ),
this, SLOT( showDefinitionInNewTab( QString const &, unsigned, QString const &, ArticleView::Contexts const & ) ) );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
connect( view, SIGNAL( typingEvent( QString const & ) ),
this, SLOT( typingEvent( QString const & ) ) );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
connect( view, SIGNAL( activeArticleChanged( const QString & ) ),
this, SLOT( activeArticleChanged( const QString & ) ) );
Various status bar related fixes: * Status Bar now available for Scan Popup window as well. * Fixed #13: Eliminated modal box when sound is not available: Instead of modal dialog box we now show the status bar message, with error icon, thus making it visible but not disruptive. * Proper handling of status bar images. * Styling of the status bar in both modes (in Mani Window and in Popup Window).
2011-07-14 20:11:57 +00:00
connect( view, SIGNAL( statusBarMessage( QString const &, int, QPixmap const & ) ),
this, SLOT( showStatusBarMessage( QString const &, int, QPixmap const & ) ) );
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
connect( view, SIGNAL( showDictsPane( ) ), this, SLOT( showDictsPane( ) ) );
Add word to history through context menu
2012-09-12 14:11:30 +00:00
connect( view, SIGNAL( forceAddWordToHistory( const QString & ) ),
this, SLOT( forceAddWordToHistory( const QString & ) ) );
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
connect( this, SIGNAL( setExpandOptionalParts( bool ) ),
view, SLOT( receiveExpandOptionalParts( bool ) ) );
connect( view, SIGNAL( setExpandMode( bool ) ), this, SLOT( setExpandMode( bool ) ) );
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
connect( view, SIGNAL( sendWordToHistory( QString ) ),
this, SLOT( addWordToHistory( QString ) ) );
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
connect( view, SIGNAL( sendWordToInputLine( QString const & ) ),
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
this, SLOT( sendWordToInputLine( QString const & ) ) );
connect( view, SIGNAL( storeResourceSavePath( QString const & ) ),
this, SLOT( storeResourceSavePath( QString const & ) ) );
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
Little correction for commit #ad8ddc8
2012-09-26 14:12:18 +00:00
view->setSelectionBySingleClick( cfg.preferences.selectWordBySingleClick );
+ Options to open tabs in background and open tabs after the current one added.
2009-04-13 12:51:25 +00:00
int index = cfg.preferences.newTabsOpenAfterCurrentOne ?
ui.tabWidget->currentIndex() + 1 : ui.tabWidget->count();
QString escaped = name;
escaped.replace( "&", "&&" );
ui.tabWidget->insertTab( index, view, escaped );
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
mruList.append(dynamic_cast<QWidget*>(view));
+ Options to open tabs in background and open tabs after the current one added.
2009-04-13 12:51:25 +00:00
if ( switchToIt )
ui.tabWidget->setCurrentIndex( index );
added zoom buttons
2009-04-30 19:57:25 +00:00
view->setZoomFactor( cfg.preferences.zoomFactor );
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#ifdef Q_OS_WIN32
view->installEventFilter( this );
#endif
+ Options to open tabs in background and open tabs after the current one added.
2009-04-13 12:51:25 +00:00
return view;
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::tabCloseRequested( int x )
{
QWidget * w = ui.tabWidget->widget( x );
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
mruList.removeOne(w);
Properly update the results pane when closing tabs
2013-06-07 13:58:27 +00:00
// In MRU case: First, we switch to the appropriate tab
// and only then remove the old one.
added drop-down tab list
2010-09-16 18:52:40 +00:00
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
//activate a tab in accordance with MRU
Properly update the results pane when closing tabs
2013-06-07 13:58:27 +00:00
if ( cfg.preferences.mruTabOrder && mruList.size() > 0 ) {
Fix crash when closing last opened tab
2012-03-27 01:38:41 +00:00
ui.tabWidget->setCurrentWidget(mruList.at(0));
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
Properly update the results pane when closing tabs
2013-06-07 13:58:27 +00:00
ui.tabWidget->removeTab( x );
delete w;
// if everything is closed, add a new tab
added drop-down tab list
2010-09-16 18:52:40 +00:00
if ( ui.tabWidget->count() == 0 )
addNewTab();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
void MainWindow::closeCurrentTab()
{
tabCloseRequested( ui.tabWidget->currentIndex() );
}
added drop-down tab list
2010-09-16 18:52:40 +00:00
void MainWindow::closeAllTabs()
{
while (ui.tabWidget->count() > 1)
closeCurrentTab();
// close last tab
closeCurrentTab();
}
void MainWindow::closeRestTabs()
{
if ( ui.tabWidget->count() < 2 )
return;
int idx = ui.tabWidget->currentIndex();
for (int i = 0; i < idx; i++)
tabCloseRequested(0);
ui.tabWidget->setCurrentIndex(0);
while (ui.tabWidget->count() > 1)
tabCloseRequested(1);
}
+ Add add/close/next/prev tab keyboard shortcuts (Ctrl-T, Ctrl-W, Ctrl-PageDn, Ctrl-PageUp).
2009-04-09 22:11:38 +00:00
void MainWindow::switchToNextTab()
{
if ( ui.tabWidget->count() < 2 )
return;
ui.tabWidget->setCurrentIndex( ( ui.tabWidget->currentIndex() + 1 ) % ui.tabWidget->count() );
}
void MainWindow::switchToPrevTab()
{
if ( ui.tabWidget->count() < 2 )
return;
if ( !ui.tabWidget->currentIndex() )
ui.tabWidget->setCurrentIndex( ui.tabWidget->count() - 1 );
else
ui.tabWidget->setCurrentIndex( ui.tabWidget->currentIndex() - 1 );
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
//emitted by tabListMenu when user releases Ctrl
void MainWindow::ctrlReleased()
{
if (tabListMenu->actions().size() > 1)
{
ui.tabWidget->setCurrentIndex(tabListMenu->activeAction()->data().toInt());
}
tabListMenu->hide();
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void MainWindow::backClicked()
{
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "Back\n" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->back();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::forwardClicked()
{
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "Forward\n" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->forward();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::titleChanged( ArticleView * view, QString const & title )
{
*! Properly escape all ampersands in tab names.
2009-04-10 21:37:16 +00:00
QString escaped = title;
escaped.replace( "&", "&&" );
ui.tabWidget->setTabText( ui.tabWidget->indexOf( view ), escaped );
Window title now shows the current headword (the current tab name).
2011-06-25 07:53:45 +00:00
updateWindowTitle();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
void MainWindow::iconChanged( ArticleView * view, QIcon const & icon )
{
+ Dictionary order and inactive dictionaries implemented.
2009-05-18 18:01:50 +00:00
ui.tabWidget->setTabIcon( ui.tabWidget->indexOf( view ), groupInstances.size() > 1 ? icon : QIcon() );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Window title now shows the current headword (the current tab name).
2011-06-25 07:53:45 +00:00
void MainWindow::updateWindowTitle()
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
if ( view )
{
Don't show welcome page header in window title (issue #195)
2013-01-31 13:01:08 +00:00
QString str = view->getTitle();
if( !str.isEmpty() )
{
if( !blockUpdateWindowTitle )
Don't translate program name
2013-02-01 12:36:01 +00:00
setWindowTitle( tr( "%1 - %2" ).arg( str, "GoldenDict" ) );
Don't show welcome page header in window title (issue #195)
2013-01-31 13:01:08 +00:00
blockUpdateWindowTitle = false;
}
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
}
Window title now shows the current headword (the current tab name).
2011-06-25 07:53:45 +00:00
}
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
void MainWindow::pageLoaded( ArticleView * view )
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
{
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
updateBackForwardButtons();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
updatePronounceAvailability();
if ( cfg.preferences.pronounceOnLoadMain )
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
pronounce( view );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
updateFoundInDictsList();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
}
Various status bar related fixes: * Status Bar now available for Scan Popup window as well. * Fixed #13: Eliminated modal box when sound is not available: Instead of modal dialog box we now show the status bar message, with error icon, thus making it visible but not disruptive. * Proper handling of status bar images. * Styling of the status bar in both modes (in Mani Window and in Popup Window).
2011-07-14 20:11:57 +00:00
void MainWindow::showStatusBarMessage( QString const & message, int timeout, QPixmap const & icon )
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
{
Various status bar related fixes: * Status Bar now available for Scan Popup window as well. * Fixed #13: Eliminated modal box when sound is not available: Instead of modal dialog box we now show the status bar message, with error icon, thus making it visible but not disruptive. * Proper handling of status bar images. * Styling of the status bar in both modes (in Mani Window and in Popup Window).
2011-07-14 20:11:57 +00:00
mainStatusBar->showMessage( message, timeout, icon );
Hovered link notifications in the status bar, just like in browsers. Move the mouse pointer over the link and see the status bar updated.
2011-07-02 13:04:49 +00:00
}
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
void MainWindow::tabSwitched( int )
{
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
translateBox->setPopupEnabled( false );
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
updateBackForwardButtons();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
updatePronounceAvailability();
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
updateFoundInDictsList();
Window title now shows the current headword (the current tab name).
2011-06-25 07:53:45 +00:00
updateWindowTitle();
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
if (mruList.size() > 1)
{
Fix potential crash on exit with multiple tabs opened
2013-05-29 06:17:12 +00:00
int from = mruList.indexOf( ui.tabWidget->widget( ui.tabWidget->currentIndex() ) );
if ( from > 0)
mruList.move( from, 0 );
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
}
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
}
added drop-down tab list
2010-09-16 18:52:40 +00:00
void MainWindow::tabMenuRequested(QPoint pos)
{
// // dont show this menu for single tab
// if ( ui.tabWidget->count() < 2 )
// return;
tabMenu->popup(ui.tabWidget->mapToGlobal(pos));
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
void MainWindow::dictionaryBarToggled( bool )
{
+! Use the triggered() signal to handle dictionary bar appearance/disappearace events, and only use toggled() one-time to perform first init of the bar, since the initialization appears to be dereffed in time. The use of triggered() instead of toggled() fixes spurious toggling events when the bar is dragged around with the mouse.
2009-09-24 12:20:20 +00:00
// From now on, only the triggered() signal is interesting to us
disconnect( dictionaryBar.toggleViewAction(), SIGNAL(toggled(bool)),
this, SLOT(dictionaryBarToggled(bool)) );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
updateDictionaryBar(); // Updates dictionary bar contents if it's shown
applyMutedDictionariesState(); // Visibility change affects searches and results
}
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
void MainWindow::pronounce( ArticleView * view )
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
{
+ Allow looking up words in the currently chosen group from the RMB menu. *! Fix issue with background tabs and pronounce-on-load when sounds are played from the current tab instead of from the the one opened.
2009-05-14 19:27:19 +00:00
if ( view )
view->playSound();
else
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
getCurrentArticleView()->playSound();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
}
Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary.
2011-07-31 00:11:07 +00:00
void MainWindow::showDictsPane( )
{
if( !ui.dictsPane->isVisible() )
ui.dictsPane->show();
}
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
void MainWindow::dictsPaneVisibilityChanged( bool visible )
{
if (visible) {
updateFoundInDictsList();
}
}
void MainWindow::updateFoundInDictsList()
{
if (!ui.dictsList->isVisible())
{
// nothing to do, the list is not visible
return;
}
ui.dictsList->clear();
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
if ( view )
{
QStringList ids = view->getArticlesList();
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
QString activeId = view->getActiveArticleId();
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
for( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd(); ++i)
{
// Find this dictionary
for( unsigned x = dictionaries.size(); x--; )
{
if ( dictionaries[ x ]->getId() == i->toUtf8().data() )
{
QString dictName = QString::fromUtf8( dictionaries[ x ]->getName().c_str() );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
QString dictId = QString::fromUtf8( dictionaries[ x ]->getId().c_str() );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
QListWidgetItem * item =
new QListWidgetItem(
Make dictionary icons to have the same sizes, to avoid visual alignment problems. * Corrected icon sizes in the "found in dictionaries" pane. * Corrected icon sizes in the preferences dialog.
2011-07-15 12:11:08 +00:00
dictionaries[ x ]->getIcon().pixmap(32).scaledToHeight( 21, Qt::SmoothTransformation ),
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
dictName,
ui.dictsList, QListWidgetItem::Type );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
item->setData(Qt::UserRole, QVariant( dictId ) );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
item->setToolTip(dictName);
ui.dictsList->addItem( item );
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
if (dictId == activeId)
{
ui.dictsList->setCurrentItem(item);
}
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
break;
}
}
}
}
}
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
void MainWindow::updateBackForwardButtons()
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
if ( view )
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
navBack->setEnabled(view->canGoBack());
navForward->setEnabled(view->canGoForward());
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
}
}
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
void MainWindow::updatePronounceAvailability()
{
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
bool pronounceEnabled = ui.tabWidget->count() > 0 &&
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
getCurrentArticleView()->hasSound();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
navPronounce->setEnabled( pronounceEnabled );
}
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
void MainWindow::editDictionaries( unsigned editDictionaryGroup )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries
scanPopup.reset(); // No scan popup either. No one should use dictionaries.
added zoom buttons
2009-04-30 19:57:25 +00:00
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
wordFinder.clear();
dictionariesUnmuted.clear();
Some strange crashes
2012-12-22 17:46:53 +00:00
{ // Limit existence of newCfg
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
Config::Class newCfg = cfg;
EditDictionaries dicts( this, newCfg, dictionaries, groupInstances, dictNetMgr );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
if ( editDictionaryGroup != Instances::Group::NoGroupId )
dicts.editGroup( editDictionaryGroup );
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
dicts.exec();
added zoom buttons
2009-04-30 19:57:25 +00:00
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
if ( dicts.areDictionariesChanged() || dicts.areGroupsChanged() )
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
// Set muted dictionaries from old groups
std::vector -> QVector in config
2012-12-10 12:49:45 +00:00
for( int x = 0; x < newCfg.groups.size(); x++ )
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
{
unsigned id = newCfg.groups[ x ].id;
if( id != Instances::Group::NoGroupId )
{
Config::Group const * grp = cfg.getGroup( id );
if( grp )
{
newCfg.groups[ x ].mutedDictionaries = grp->mutedDictionaries;
newCfg.groups[ x ].popupMutedDictionaries = grp->popupMutedDictionaries;
}
}
}
cfg = newCfg;
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
updateGroupList();
added zoom buttons
2009-04-30 19:57:25 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
Config::save( cfg );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
added zoom buttons
2009-04-30 19:57:25 +00:00
Some strange crashes
2012-12-22 17:46:53 +00:00
}
Scan popup functionality implemented, among with other small improvements. For now, the modifier key is hardcoded to be Ctrl.
2009-02-01 00:08:08 +00:00
makeScanPopup();
* Both Sources and Groups were consolidated into a single Dictionaries window. This change required quite a lot of overhaul.
2009-04-30 15:29:03 +00:00
installHotKeys();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
void MainWindow::editCurrentGroup()
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
editDictionaries( groupList->getCurrentGroup() );
Allow editing dictionary groups right from the dictionary bar (Right Click-> Edit this group).
2010-05-08 14:01:59 +00:00
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
void MainWindow::editPreferences()
{
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
hotkeyWrapper.reset(); // So we could use the keys it hooks
Disable the Scan Pop-up when a Preferences dialog is open
2013-05-17 12:34:28 +00:00
scanPopup.reset(); // No scan popup either. No one should use dictionaries.
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
Preferences preferences( this, cfg.preferences );
preferences.show();
if ( preferences.exec() == QDialog::Accepted )
{
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
Config::Preferences p = preferences.getPreferences();
Lost some settings when "Options" dialog called (issue #135)
2012-11-12 14:34:47 +00:00
// These parameters are not set in dialog
p.zoomFactor = cfg.preferences.zoomFactor;
p.wordsZoomLevel = cfg.preferences.wordsZoomLevel;
p.hideMenubar = cfg.preferences.hideMenubar;
Make sure that UI mode and Always On Top flag are preserved on config changes.
2013-01-09 12:17:15 +00:00
p.searchInDock = cfg.preferences.searchInDock;
p.alwaysOnTop = cfg.preferences.alwaysOnTop;
Lost some settings when "Options" dialog called (issue #135)
2012-11-12 14:34:47 +00:00
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
bool needReload = false;
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
// See if we need to reapply stylesheets
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
if ( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.addonStyle != p.addonStyle )
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
{
Switch user styles on-the-fly
2012-12-10 14:14:13 +00:00
applyQtStyleSheet( p.displayStyle, p.addonStyle );
articleMaker.setDisplayStyle( p.displayStyle, p.addonStyle );
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
needReload = true;
}
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
Allow to collapse/expand articles; auto collapse for big articles (issue #331)
2013-06-02 11:20:33 +00:00
if( cfg.preferences.collapseBigArticles != p.collapseBigArticles
|| cfg.preferences.articleSizeLimit != p.articleSizeLimit )
{
articleMaker.setCollapseParameters( p.collapseBigArticles, p.articleSizeLimit );
}
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
// See if we need to reapply expand optional parts mode
if( cfg.preferences.alwaysExpandOptionalParts != p.alwaysExpandOptionalParts )
{
emit setExpandOptionalParts( p.alwaysExpandOptionalParts );
// Signal setExpandOptionalParts reload all articles
needReload = false;
}
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
for( int x = 0; x < ui.tabWidget->count(); ++x )
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
{
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
ArticleView & view =
dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( x ) ) );
view.setSelectionBySingleClick( p.selectWordBySingleClick );
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
Add option for word selection by single mouse click
2012-09-26 13:59:48 +00:00
if( needReload )
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
view.reload();
}
Periodical save of history (issue #209)
2013-02-05 12:51:23 +00:00
if( cfg.preferences.historyStoreInterval != p.historyStoreInterval )
history.setSaveInterval( p.historyStoreInterval );
+ Implement switchable display styles. For now 'Default' and 'Lingvo'.
2009-05-11 11:03:36 +00:00
cfg.preferences = p;
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
beforeScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
enableScanPopup->setVisible( cfg.preferences.enableScanPopup );
Move Print and Save buttons further down. The buttons are rarerly used and there is no point in keeping them close to the beginning of the toolbar.
2012-12-26 13:46:04 +00:00
afterScanPopupSeparator->setVisible( cfg.preferences.enableScanPopup );
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
if ( !cfg.preferences.enableScanPopup )
enableScanPopup->setChecked( false );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
updateTrayIcon();
+ Proxy server configuration is now supported.
2009-04-03 17:10:27 +00:00
applyProxySettings();
Add a "Enable web plugins" option under Edit > Preferences > Network. It allows to listen to sound pronunciations from online dictionaries that rely on flash plugin such as howjsay.com and dictionary.com. Plugin must be installed for this option to work. See http://doc.trolltech.com/4.5/qtwebkit.html#netscape-plugin-support
2011-05-08 21:19:08 +00:00
applyWebSettings();
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
makeScanPopup();
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Hide single tab option is implemented. By default, it's turned off (== current behavior).
2011-06-23 14:17:09 +00:00
ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
setAutostart( cfg.preferences.autoStart );
prepareNewReleaseChecks();
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Allow to turn on/off history in preferences
2012-09-11 13:03:10 +00:00
history.enableAdd( cfg.preferences.storeHistory );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
history.setMaxSize( cfg.preferences.maxStringsInHistory );
ui.historyPaneWidget->updateHistoryCounts();
Allow to turn on/off history in preferences
2012-09-11 13:03:10 +00:00
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
Config::save( cfg );
}
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
Disable the Scan Pop-up when a Preferences dialog is open
2013-05-17 12:34:28 +00:00
makeScanPopup();
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
installHotKeys();
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
}
* Give groups numerical ids and switch to use them everywhere instead of names to identify them.
2009-04-10 12:48:40 +00:00
void MainWindow::currentGroupChanged( QString const & )
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
cfg.lastMainGroupId = groupList->getCurrentGroup();
Own muted dictionaries list for each group
2012-09-26 13:13:47 +00:00
Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
if( cfg.lastMainGroupId == Instances::Group::AllGroupId )
{
if( igrp )
igrp->checkMutedDictionaries( &cfg.mutedDictionaries );
dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
}
else
{
Config::Group * grp = cfg.getGroup( cfg.lastMainGroupId );
if( grp )
{
if( igrp )
igrp->checkMutedDictionaries( &grp->mutedDictionaries );
dictionaryBar.setMutedDictionaries( &grp->mutedDictionaries );
}
else
dictionaryBar.setMutedDictionaries( 0 );
}
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
+ Dictionary bar partially implemented. This is work in progress.
2009-09-21 17:50:03 +00:00
updateDictionaryBar();
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
// Update word search results
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
translateBox->setPopupEnabled( false );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
translateInputChanged( translateLine->text() );
translateInputFinished( false );
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
updateCurrentGroupProperty();
}
void MainWindow::updateCurrentGroupProperty()
{
// We maintain currentGroup property so styles could use that to change
// fonts based on group names
Instances::Group * grp =
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupInstances.findGroup( groupList->getCurrentGroup() );
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( grp && translateLine->property( "currentGroup" ).toString() !=
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
grp->name )
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setProperty( "currentGroup", grp->name );
wordList->setProperty( "currentGroup", grp->name );
Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property. To use, create ~/.goldendict/qt-style.css like this: MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"] { background: white; color: black; font-size: 20px; }
2010-11-15 15:22:35 +00:00
QString ss = styleSheet();
// Only update stylesheet if it mentions currentGroup, as updating the
// stylesheet is a slow operation
if ( ss.contains("currentGroup") )
setStyleSheet( ss );
}
+ Implement saving and restoring of the last chosen groups.
2009-02-06 17:04:11 +00:00
}
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
void MainWindow::translateInputChanged( QString const & newValue )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// If there's some status bar message present, clear it since it may be
// about the previous search that has failed.
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
if ( !mainStatusBar->currentMessage().isEmpty() )
{
mainStatusBar->clearMessage();
}
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
*! Prevent triggering spurious translations when changing group or editing the query while there's an item in the word list selected.
2009-10-21 20:23:03 +00:00
// If some word is selected in the word list, unselect it. This prevents
// triggering a set of spurious activation signals when the list changes.
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( wordList->selectionModel()->hasSelection() )
wordList->setCurrentItem( 0, QItemSelectionModel::Clear );
*! Prevent triggering spurious translations when changing group or editing the query while there's an item in the word list selected.
2009-10-21 20:23:03 +00:00
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
QString req = newValue.trimmed();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
if ( !req.size() )
{
// An empty request always results in an empty result
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
wordFinder.cancel();
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
wordList->clear();
wordList->unsetCursor();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
// Reset the noResults mark if it's on right now
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( translateLine->property( "noResults" ).toBool() )
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setProperty( "noResults", false );
+ 'WebSites' implemented. *! Don't set a global qt stylesheet - sometimes WebKit crashes with it. *! Fixes for text search feature (works faster, no selection artifacts, frame doesn't grow).
2009-05-16 18:04:21 +00:00
setStyleSheet( styleSheet() );
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
return;
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
wordList->setCursor( Qt::WaitCursor );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
* Major dictionary interface rework. Dictionaries now return Request objects which can provide results asyncronously, be discarded prematurely etc. This work touches just about every piece of exiting code. + On top of the new interface, MediaWiki (Wikipedia) support was added. * Some other small fixes might went along.
2009-03-26 19:00:08 +00:00
wordFinder.prefixMatch( req, getActiveDicts() );
Implement asyncronous word finding.
2009-01-29 19:16:25 +00:00
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
Show new translation after group changing
2012-09-03 12:42:43 +00:00
void MainWindow::translateInputFinished( bool checkModifiers )
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
QString word = translateLine->text();
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
if ( word.size() )
added Ctrl-Enter hotkey which opens current translation in a new tab
2009-05-05 20:12:20 +00:00
{
Qt::KeyboardModifiers mods = QApplication::keyboardModifiers();
Show new translation after group changing
2012-09-03 12:42:43 +00:00
if ( checkModifiers && ( mods & (Qt::ControlModifier | Qt::ShiftModifier) ) )
added Ctrl-Enter hotkey which opens current translation in a new tab
2009-05-05 20:12:20 +00:00
addNewTab();
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
showTranslationFor( word );
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( cfg.preferences.searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
if ( ui.searchPane->isFloating() )
activateWindow();
}
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
getCurrentArticleView()->focus();
added Ctrl-Enter hotkey which opens current translation in a new tab
2009-05-05 20:12:20 +00:00
}
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
}
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
void MainWindow::handleEsc()
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
if ( view && view->closeSearch() )
+ 'Text Find' implemented.
2009-05-16 11:14:43 +00:00
return;
Restore default behaviour for ESC key. There is now a "ESC key hides main window" option under Edit > Preferences > Interface.
2011-05-07 13:42:49 +00:00
if( cfg.preferences.escKeyHidesMainWindow )
make ESC minimizes the main window when tray icon is totally disabled.
2011-05-30 00:44:12 +00:00
{
When the tray icon is disabled, the global hide/show shortcut should just minimize the main window. Before this change, the shortcut in such situation was just doing nothing, the main window remained active. Tray icons are not that useful in Win7, since it is much better to just pin the application to the taksbar. Now GoldenDict works properly in such situations.
2011-06-24 19:03:03 +00:00
toggleMainWindow();
make ESC minimizes the main window when tray icon is totally disabled.
2011-05-30 00:44:12 +00:00
}
Restore default behaviour for ESC key. There is now a "ESC key hides main window" option under Edit > Preferences > Interface.
2011-05-07 13:42:49 +00:00
else
focusTranslateLine();
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
}
void MainWindow::focusTranslateLine()
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( cfg.preferences.searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
if ( ui.searchPane->isFloating() )
ui.searchPane->activateWindow();
}
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
else
{
if ( !isActiveWindow() )
activateWindow();
}
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setFocus();
translateLine->selectAll();
+ Pressing Esc clears the translation line and gives it keyboard focus.
2009-04-08 22:25:46 +00:00
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
void MainWindow::applyMutedDictionariesState()
{
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
translateBox->setPopupEnabled( false );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
// Redo the current search request
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
translateInputChanged( translateLine->text() );
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
if ( view )
Don't crash on startup if the dictionary bar has been made floating previously. Closes #9.
2011-06-11 04:50:19 +00:00
{
// Update active article view
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->updateMutedContents();
Don't crash on startup if the dictionary bar has been made floating previously. Closes #9.
2011-06-11 04:50:19 +00:00
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
}
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
bool MainWindow::handleBackForwardMouseButtons ( QMouseEvent * event) {
if ( event->button() == Qt::XButton1 ) {
backClicked();
return true;
}
else
if ( event->button() == Qt::XButton2 ) {
forwardClicked();
return true;
}
else
return false;
}
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
{
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
if ( ev->type() == QEvent::ShortcutOverride ) {
// Handle Ctrl+H to show the History Pane.
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
QKeyEvent * ke = static_cast<QKeyEvent*>( ev );
if ( ke->key() == Qt::Key_H && ke->modifiers() == Qt::ControlModifier )
{
on_showHideHistory_triggered();
ev->accept();
return true;
}
Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window.
2013-01-23 18:36:45 +00:00
// Handle F3/Shift+F3 shortcuts
if ( ke->key() == Qt::Key_F3 )
{
ArticleView * view = getCurrentArticleView();
if ( view && view->handleF3( obj, ev ) )
return true;
}
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
}
Fixed issue #144: wordlist suggestions stay on the screen even when the window is moved/resized.
2012-12-25 09:25:54 +00:00
// when the main window is moved or resized, hide the word list suggestions
if ( obj == this && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) )
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( !cfg.preferences.searchInDock )
Fixed issue #144: wordlist suggestions stay on the screen even when the window is moved/resized.
2012-12-25 09:25:54 +00:00
{
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
translateBox->setPopupEnabled( false );
Fixed issue #144: wordlist suggestions stay on the screen even when the window is moved/resized.
2012-12-25 09:25:54 +00:00
return false;
}
}
Properly restore main window maximized state when it activated through tray icon
2013-01-23 20:36:53 +00:00
if ( obj == this && ev->type() == QEvent::WindowStateChange )
{
QWindowStateChangeEvent *stev = static_cast< QWindowStateChangeEvent *>( ev );
wasMaximized = ( stev->oldState() == Qt::WindowMaximized && isMinimized() );
}
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
if ( ev->type() == QEvent::MouseButtonPress ) {
QMouseEvent * event = static_cast< QMouseEvent * >( ev );
Some more cases where it is appropriate to hide the word list.
2012-12-25 20:38:28 +00:00
// clicks outside of the word list should hide it.
if (obj != translateBox->wordList() && obj != translateBox->wordList()->viewport()) {
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
translateBox->setPopupEnabled( false );
Some more cases where it is appropriate to hide the word list.
2012-12-25 20:38:28 +00:00
}
Handling of backward and forward mouse buttons. They now do what is most logical for them to do: going backwards and forwards in history.
2011-06-07 08:26:49 +00:00
return handleBackForwardMouseButtons( event );
}
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
if (ev->type() == QEvent::KeyPress)
{
QKeyEvent *keyevent = static_cast<QKeyEvent*>(ev);
if (keyevent->modifiers() == Qt::ControlModifier && keyevent->key() == Qt::Key_Tab)
{
if (cfg.preferences.mruTabOrder)
{
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
ctrlTabPressed();
return true;
MRU tab switching implemented
2011-11-02 23:37:50 +00:00
}
return false;
}
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( obj == translateLine )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
Deal with X11 headers mess that causes compilation errors
2011-06-09 07:29:21 +00:00
if ( ev->type() == QEvent::KeyPress )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( cfg.preferences.searchInDock )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( keyEvent->matches( QKeySequence::MoveToNextLine ) && wordList->count() )
{
wordList->setFocus( Qt::ShortcutFocusReason );
Fixed regression #141.
2012-12-24 21:56:31 +00:00
wordList->setCurrentRow( 0, QItemSelectionModel::ClearAndSelect );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
return true;
}
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
}
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
Deal with X11 headers mess that causes compilation errors
2011-06-09 07:29:21 +00:00
if ( ev->type() == QEvent::FocusIn ) {
Fixed #1: Translate line should select all on mouse click that brings focus
2011-06-08 10:31:03 +00:00
QFocusEvent * focusEvent = static_cast< QFocusEvent * >( ev );
// select all on mouse click
if ( focusEvent->reason() == Qt::MouseFocusReason ) {
QTimer::singleShot(0, this, SLOT(focusTranslateLine()));
}
return false;
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( ev->type() == QEvent::Resize ) {
QResizeEvent * resizeEvent = static_cast< QResizeEvent * >( ev );
groupList->setFixedHeight( resizeEvent->size().height() );
return false;
}
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
}
else
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( obj == wordList )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
Deal with X11 headers mess that causes compilation errors
2011-06-09 07:29:21 +00:00
if ( ev->type() == QEvent::KeyPress )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
if ( keyEvent->matches( QKeySequence::MoveToPreviousLine ) &&
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
!wordList->currentRow() )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
wordList->setCurrentRow( 0, QItemSelectionModel::Clear );
translateLine->setFocus( Qt::ShortcutFocusReason );
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
return true;
}
if ( keyEvent->matches( QKeySequence::InsertParagraphSeparator ) &&
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
wordList->selectedItems().size() )
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( cfg.preferences.searchInDock )
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
{
if ( ui.searchPane->isFloating() )
activateWindow();
}
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
getCurrentArticleView()->focus();
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
return cfg.preferences.searchInDock;
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
}
added changes in order to be able to get it compiled with MSVC (no project yet)
2009-04-29 23:18:26 +00:00
Typing while focused on the word list initiates new search now.
2009-12-13 17:15:34 +00:00
// Handle typing events used to initiate new lookups
Fixes after code review: * Replaced the search via dictionary name by search via dictionary id, cleanup * Renamed "Dictionaries Pane" --> "Results Navigation Pane" * Added to CREDITS * TODO note about code duplication
2011-06-06 09:54:23 +00:00
// TODO: refactor to eliminate duplication (see below)
Typing while focused on the word list initiates new search now.
2009-12-13 17:15:34 +00:00
if ( keyEvent->modifiers() &
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
( Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier ) )
return false; // A non-typing modifier is pressed
if ( keyEvent->key() == Qt::Key_Space ||
keyEvent->key() == Qt::Key_Backspace ||
Fixed Shift-Tab problems, reported in #22.
2011-07-04 08:35:56 +00:00
keyEvent->key() == Qt::Key_Tab ||
keyEvent->key() == Qt::Key_Backtab )
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
return false; // Those key have other uses than to start typing
// or don't make sense
QString text = keyEvent->text();
if ( text.size() )
{
typingEvent( text );
return true;
}
}
}
else
if (obj == ui.dictsList) {
Deal with X11 headers mess that causes compilation errors
2011-06-09 07:29:21 +00:00
if ( ev->type() == QEvent::KeyPress )
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
{
QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
// Handle typing events used to initiate new lookups
Fixes after code review: * Replaced the search via dictionary name by search via dictionary id, cleanup * Renamed "Dictionaries Pane" --> "Results Navigation Pane" * Added to CREDITS * TODO note about code duplication
2011-06-06 09:54:23 +00:00
// TODO: refactor to eliminate duplication (see above)
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
if ( keyEvent->modifiers() &
( Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier ) )
Typing while focused on the word list initiates new search now.
2009-12-13 17:15:34 +00:00
return false; // A non-typing modifier is pressed
if ( keyEvent->key() == Qt::Key_Space ||
keyEvent->key() == Qt::Key_Backspace ||
Fixed Shift-Tab problems, reported in #22.
2011-07-04 08:35:56 +00:00
keyEvent->key() == Qt::Key_Tab ||
keyEvent->key() == Qt::Key_Backtab )
Typing while focused on the word list initiates new search now.
2009-12-13 17:15:34 +00:00
return false; // Those key have other uses than to start typing
// or don't make sense
QString text = keyEvent->text();
if ( text.size() )
{
typingEvent( text );
return true;
}
+ Allow navigating down to the word list from the translation line and back by pressing Down or Up keys, respectively. * Pressing Enter on the translation line directly translates what is typed there now, irrespectively of whether there are any word matches or not.
2009-03-29 17:38:54 +00:00
}
}
return QMainWindow::eventFilter( obj, ev );
return false;
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
void MainWindow::wordListItemActivated( QListWidgetItem * item )
{
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
if( wordListSelChanged )
wordListSelChanged = false;
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
else {
// TODO: code duplication with translateInputFinished!
Qt::KeyboardModifiers mods = QApplication::keyboardModifiers();
if ( mods & (Qt::ControlModifier | Qt::ShiftModifier) )
addNewTab();
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
showTranslationFor( item->text() );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
getCurrentArticleView()->focus();
}
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
void MainWindow::wordListSelectionChanged()
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
QList< QListWidgetItem * > selected = wordList->selectedItems();
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
if ( selected.size() )
Show translation again after click on selected word in the words search list
2012-11-25 11:37:57 +00:00
{
wordListSelChanged = true;
showTranslationFor( selected.front()->text() );
}
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
}
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
void MainWindow::dictsListItemActivated( QListWidgetItem * item )
{
Jump to article when double-clicking on dictinary in "Found in Dictionaries" This forces the jump even when the dictionary is already a current/active dictionary. This is convenient for the following use-cases: 1. User manually scrolls far away from the current dictionary and would like to return. 2. User jumps far away from the current dictionary when doing search (Ctrl+F). 3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 16:00:13 +00:00
jumpToDictionary( item, true );
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
}
void MainWindow::dictsListSelectionChanged()
{
QList< QListWidgetItem * > selected = ui.dictsList->selectedItems();
if ( selected.size() )
Jump to article when double-clicking on dictinary in "Found in Dictionaries" This forces the jump even when the dictionary is already a current/active dictionary. This is convenient for the following use-cases: 1. User manually scrolls far away from the current dictionary and would like to return. 2. User jumps far away from the current dictionary when doing search (Ctrl+F). 3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 16:00:13 +00:00
jumpToDictionary( selected.front() );
}
void MainWindow::jumpToDictionary( QListWidgetItem * item, bool force )
{
ArticleView * view = getCurrentArticleView();
if ( view )
{
view->jumpToDictionary( item->data( Qt::UserRole ).toString(), force );
}
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
}
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
void MainWindow::openLinkInNewTab( QUrl const & url,
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
QUrl const & referrer,
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QString const & fromArticle,
ArticleView::Contexts const & contexts )
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
{
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
createNewTab( !cfg.preferences.newTabsOpenInBackground, "" )->
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
openLink( url, referrer, fromArticle, contexts );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
}
void MainWindow::showDefinitionInNewTab( QString const & word,
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
unsigned group,
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
QString const & fromArticle,
ArticleView::Contexts const & contexts )
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
{
+ Navigating away from within any article belonging to some dictionary will result in scrolling to the same dictionary for newly opened content. + Some more css markup was added, in part to accomplish the above, in part to make the navigation look better (i.e. have space before article).
2009-05-11 19:14:28 +00:00
createNewTab( !cfg.preferences.newTabsOpenInBackground, word )->
+ Support for folloing websites' links in-place. The actual link is followed for the website, while the query word is set to the link's text as used for all other dictionaries in the group. * Some associated cleanup (better scrolling to articles, better external link handling). The changes might cause problems - test!
2009-05-29 19:48:50 +00:00
showDefinition( word, group, fromArticle, contexts );
+ Implement "in new tab" context menu choices in article view.
2009-02-08 15:49:17 +00:00
}
Sync between the currently active article and the "found in dictionaries" pane. Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts), corresponding dictionary in the "found in dictionaries" pane is selected. See Issue #22. P.S. Lingvo behaves in the same way too.
2011-07-03 12:27:08 +00:00
void MainWindow::activeArticleChanged( QString const & id )
{
// select the row with the corresponding id
for (int i = 0; i < ui.dictsList->count(); ++i) {
QListWidgetItem * w = ui.dictsList->item( i );
QString dictId = w->data( Qt::UserRole ).toString();
if ( dictId == id )
{
// update the current row, but only if necessary
if ( i != ui.dictsList->currentRow() )
{
ui.dictsList->setCurrentRow(i);
}
return;
}
}
}
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
void MainWindow::typingEvent( QString const & t )
{
*! Some fixes for "type-to-search" feature.
2009-05-12 15:54:37 +00:00
if ( t == "\n" || t == "\r" )
Large search history
2012-02-16 14:56:25 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if( translateLine->isEnabled() )
Large search history
2012-02-16 14:56:25 +00:00
focusTranslateLine();
}
*! Some fixes for "type-to-search" feature.
2009-05-12 15:54:37 +00:00
else
{
Fixed #143: Make the new UI mode the default one.
2013-01-05 11:26:55 +00:00
if ( ( cfg.preferences.searchInDock && ui.searchPane->isFloating() ) || ui.dictsPane->isFloating() )
+! Activate the appropriate windows back and forth when the searchPane is floating.
2009-05-13 13:47:51 +00:00
ui.searchPane->activateWindow();
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if( translateLine->isEnabled() )
Large search history
2012-02-16 14:56:25 +00:00
{
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setFocus();
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
if ( cfg.preferences.searchInDock )
translateLine->setText( t );
else
translateBox->setText( t, true );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setCursorPosition( t.size() );
Large search history
2012-02-16 14:56:25 +00:00
}
*! Some fixes for "type-to-search" feature.
2009-05-12 15:54:37 +00:00
}
+ Pressing Enter in translateLine focuses on definition. + Typing any text key switches back to translateLine and puts it there.
2009-05-12 13:25:18 +00:00
}
+ Dictionary bar, a bar with dictonary icons for the current group, was implemented. Clicking icons disables corresponding dictionaries. When clicking with Shift/Ctrl, a dictionary can be made solo. The feature is currently only available in main window only, scan popup will be addressed later. + 'View' menu introduced. It allows switching toolbars and side pane on/off without any arcane knowledge on how to toggle them on/off via RMB.
2009-09-23 18:44:38 +00:00
void MainWindow::mutedDictionariesChanged()
{
if ( dictionaryBar.toggleViewAction()->isChecked() )
applyMutedDictionariesState();
}
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
void MainWindow::showHistoryItem( QString const & word )
{
// qDebug() << "Showing history item" << word;
history.enableAdd( false );
Fixed #192: Dynamically adjust the suggestion list in the new UI.
2013-01-27 22:12:00 +00:00
if ( cfg.preferences.searchInDock )
translateLine->setText( word );
else
translateBox->setText( word, false );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
showTranslationFor( word );
history.enableAdd( cfg.preferences.storeHistory );
}
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
void MainWindow::showTranslationFor( QString const & inWord,
*! Fix problem with the 'All' group in history. The value of it is too large for a signed int.
2009-10-21 20:06:17 +00:00
unsigned inGroup )
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
navPronounce->setEnabled( false );
*! Fix problem with the 'All' group in history. The value of it is too large for a signed int.
2009-10-21 20:06:17 +00:00
unsigned group = inGroup ? inGroup :
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
( groupInstances.empty() ? 0 :
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupInstances[ groupList->currentIndex() ].id );
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->showDefinition( inWord, group );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
updatePronounceAvailability();
Implemented Dictionaries Pane, to show dicts in which results were found. It is a separate detacheable pane, which could also be enabled/disabled, it tracks the current tab's contains, and lists those dictionaries that contributed their content to the current translation. Clicking on dictionary name jumps to the appropriate article from this dictionary, which improves the navigation flow. The Dictionaries Pane: * Shows both dictionaries' names and icons. * Does not consume resources when hidden. * Properly styled. * Properly handles app-wide shortcuts (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 11:49:50 +00:00
updateFoundInDictsList();
+ Ability to play the first audio reference by clicking on the 'Pronounce word' button in main window or in scan popup added. It is also possible to configure the program to do that automatically. + It is now possible to specify which program to use for audio file playback.
2009-04-10 21:07:03 +00:00
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
// Add to history
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
addWordToHistory( inWord );
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
Enable/disable Back and Forward buttons depending on the history. This is a standard behavior for any history-enabled app (like web browser). When there is no previous or next item in the history, the appropriate button on the toolbar is disabled.
2011-06-07 11:27:19 +00:00
updateBackForwardButtons();
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
#if 0
QUrl req;
req.setScheme( "gdlookup" );
req.setHost( "localhost" );
req.addQueryItem( "word", inWord );
req.addQueryItem( "group",
cfg.groups.empty() ? "" :
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
groupInstances[ groupList->currentIndex() ].name );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.definition->load( req );
return;
#endif
#if 0
wstring word = inWord.trimmed().toStdWString();
// Where to look?
vector< sptr< Dictionary::Class > > const & activeDicts = getActiveDicts();
// Accumulate main forms
vector< wstring > alts;
{
set< wstring > altsSet;
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
for( unsigned x = 0; x < activeDicts.size(); ++x )
{
vector< wstring > found = activeDicts[ x ]->findHeadwordsForSynonym( word );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
altsSet.insert( found.begin(), found.end() );
}
alts.insert( alts.begin(), altsSet.begin(), altsSet.end() );
}
for( unsigned x = 0; x < alts.size(); ++x )
{
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "Alt: %ls\n", alts[ x ].c_str() );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
}
string result =
"<html><head>"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">";
QFile cssFile( Config::getUserCssFileName() );
if ( cssFile.open( QFile::ReadOnly ) )
{
result += "<style type=\"text/css\">\n";
result += cssFile.readAll().data();
result += "</style>\n";
}
result += "</head><body>";
for( unsigned x = 0; x < activeDicts.size(); ++x )
{
try
{
string body = activeDicts[ x ]->getArticle( word, alts );
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "From %s: %s\n", activeDicts[ x ]->getName().c_str(), body.c_str() );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
result += "<div class=\"gddictname\">From " + activeDicts[ x ]->getName() + "</div>" + body;
}
catch( Dictionary::exNoSuchWord & )
{
continue;
}
}
result += "</body></html>";
ArticleMaker am( dictionaries, groupInstances );
updated (added libqxt and global shortcut Ctrl-F11; fixed issue with autostart on Vista)
2009-04-19 21:32:18 +00:00
string result = am.makeDefinitionFor( inWord, "En" );
Created /trunk/src and moved everything there.
2009-01-28 20:55:45 +00:00
ui.definition->setContent( result.c_str(), QString() );
#endif
//ui.tabWidget->setTabText( ui.tabWidget->indexOf(ui.tab), inWord.trimmed() );
}
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
Window activation under Linux again (issue #235)
2013-03-11 12:56:26 +00:00
#ifdef Q_WS_X11
void MainWindow::toggleMainWindow( bool onlyShow, bool byIconClick )
#else
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
void MainWindow::toggleMainWindow( bool onlyShow )
Window activation under Linux again (issue #235)
2013-03-11 12:56:26 +00:00
#endif
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
{
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
bool shown = false;
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
if ( !isVisible() )
*! When toggling main window and it's not visible, activate and raise it.
2009-05-07 16:22:17 +00:00
{
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
show();
Focus GoldenDict window after restoring it from tray by hotkey under Ubuntu (issue #95)
2012-12-29 10:01:36 +00:00
qApp->setActiveWindow( this );
*! When toggling main window and it's not visible, activate and raise it.
2009-05-07 16:22:17 +00:00
activateWindow();
raise();
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
shown = true;
*! When toggling main window and it's not visible, activate and raise it.
2009-05-07 16:22:17 +00:00
}
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
else
if ( isMinimized() )
{
Properly restore main window maximized state when it activated through tray icon
2013-01-23 20:36:53 +00:00
if( wasMaximized )
showMaximized();
else
showNormal();
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
activateWindow();
raise();
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
shown = true;
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
}
else
if ( !isActiveWindow() )
{
activateWindow();
raise();
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
shown = true;
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
}
else
if ( !onlyShow )
When the tray icon is disabled, the global hide/show shortcut should just minimize the main window. Before this change, the shortcut in such situation was just doing nothing, the main window remained active. Tray icons are not that useful in Win7, since it is much better to just pin the application to the taksbar. Now GoldenDict works properly in such situations.
2011-06-24 19:03:03 +00:00
{
if (cfg.preferences.enableTrayIcon)
hide();
else
showMinimized();
}
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
if ( shown )
Focus GoldenDict window after restoring it from tray by hotkey under Ubuntu (issue #95)
2012-12-29 10:01:36 +00:00
{
Toggling main window gives focus to the translation line. Additionally, any opened search is now closed once a new definition is shown in the article view.
2010-04-27 07:49:37 +00:00
focusTranslateLine();
Focus GoldenDict window after restoring it from tray by hotkey under Ubuntu (issue #95)
2012-12-29 10:01:36 +00:00
#ifdef Q_WS_X11
Window wh = 0;
int rev = 0;
XGetInputFocus( QX11Info::display(), &wh, &rev );
Window activation under Linux again (issue #235)
2013-03-11 12:56:26 +00:00
if( wh != translateLine->internalWinId() && !byIconClick )
Windows switching under Ubuntu Unity (issue #204)
2013-02-08 11:49:14 +00:00
{
QPoint p( 1, 1 );
mapToGlobal( p );
XEvent event;
memset( &event, 0, sizeof( event) );
event.type = ButtonPress;
event.xbutton.x = 1;
event.xbutton.y = 1;
event.xbutton.x_root = p.x();
event.xbutton.y_root = p.y();
event.xbutton.window = internalWinId();
event.xbutton.root = QX11Info::appRootWindow( QX11Info::appScreen() );
event.xbutton.state = Button1Mask;
event.xbutton.button = Button1;
event.xbutton.same_screen = true;
event.xbutton.time = CurrentTime;
XSendEvent( QX11Info::display(), internalWinId(), true, 0xfff, &event );
XFlush( QX11Info::display() );
event.type = ButtonRelease;
XSendEvent( QX11Info::display(), internalWinId(), true, 0xfff, &event );
XFlush( QX11Info::display() );
}
Focus GoldenDict window after restoring it from tray by hotkey under Ubuntu (issue #95)
2012-12-29 10:01:36 +00:00
#endif
}
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
}
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
void MainWindow::installHotKeys()
{
hotkeyWrapper.reset(); // Remove the old one
if ( cfg.preferences.enableMainWindowHotkey ||
cfg.preferences.enableClipboardHotkey )
{
try
{
hotkeyWrapper = new HotkeyWrapper( this );
}
catch( HotkeyWrapper::exInit & )
{
Don't translate program name
2013-02-01 12:36:01 +00:00
QMessageBox::critical( this, "GoldenDict",
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
tr( "Failed to initialize hotkeys monitoring mechanism.<br>"
"Make sure your XServer has RECORD extension turned on." ) );
return;
}
Only install main window global hotkey if it is actually enabled.
2010-03-19 14:17:45 +00:00
if ( cfg.preferences.enableMainWindowHotkey )
hotkeyWrapper->setGlobalKey( cfg.preferences.mainWindowHotkey.key1,
cfg.preferences.mainWindowHotkey.key2,
cfg.preferences.mainWindowHotkey.modifiers,
0 );
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
if ( cfg.preferences.enableClipboardHotkey && scanPopup.get() )
{
hotkeyWrapper->setGlobalKey( cfg.preferences.clipboardHotkey.key1,
cfg.preferences.clipboardHotkey.key2,
cfg.preferences.clipboardHotkey.modifiers,
1 );
}
connect( hotkeyWrapper.get(), SIGNAL( hotkeyActivated( int ) ),
this, SLOT( hotKeyActivated( int ) ) );
}
}
void MainWindow::hotKeyActivated( int hk )
{
if ( !hk )
When the tray icon is disabled, the global hide/show shortcut should just minimize the main window. Before this change, the shortcut in such situation was just doing nothing, the main window remained active. Tray icons are not that useful in Win7, since it is much better to just pin the application to the taksbar. Now GoldenDict works properly in such situations.
2011-06-24 19:03:03 +00:00
toggleMainWindow();
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
else
if ( scanPopup.get() )
scanPopup->translateWordFromClipboard();
}
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
void MainWindow::prepareNewReleaseChecks()
{
if ( cfg.preferences.checkForNewReleases )
{
QDateTime now = QDateTime::currentDateTime();
if ( !cfg.timeForNewReleaseCheck.isValid() ||
now.daysTo( cfg.timeForNewReleaseCheck ) > 2 )
{
// The date is invalid, or the check is set to happen more than 2 days
// in the future -- fix that.
cfg.timeForNewReleaseCheck = now.addDays( 2 );
}
int secsToCheck = now.secsTo( cfg.timeForNewReleaseCheck );
if ( secsToCheck < 1 )
secsToCheck = 1;
newReleaseCheckTimer.setSingleShot( true );
newReleaseCheckTimer.start( secsToCheck * 1000 );
}
else
newReleaseCheckTimer.stop(); // In case it was started before
}
void MainWindow::checkForNewRelease()
{
Don't delete latest release reply directly in slot
2013-06-07 12:59:18 +00:00
if( latestReleaseReply )
latestReleaseReply->deleteLater();
Zeroing latestReleaseReply after deleteLater()
2013-06-11 04:08:25 +00:00
latestReleaseReply = 0;
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
QNetworkRequest req(
Update project domain name (goldendict.berlios.de -> goldendict.org)
2010-11-06 19:40:07 +00:00
QUrl( "http://goldendict.org/latest_release.php?current="
* When checking for the latest release, supply the platform used.
2009-04-20 20:59:50 +00:00
PROGRAM_VERSION "&platform="
#ifdef Q_WS_X11
"x11"
#endif
#ifdef Q_WS_MAC
"mac"
#endif
#ifdef Q_WS_QWS
"qws"
#endif
#ifdef Q_WS_WIN
"win"
#endif
) );
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
latestReleaseReply = articleNetMgr.get( req );
Don't delete latest release reply directly in slot
2013-06-07 12:59:18 +00:00
connect( latestReleaseReply, SIGNAL( finished() ),
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
this, SLOT( latestReleaseReplyReady() ), Qt::QueuedConnection );
}
void MainWindow::latestReleaseReplyReady()
{
Don't delete latest release reply directly in slot
2013-06-07 12:59:18 +00:00
if ( !latestReleaseReply )
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
return; // Some stray signal
bool success = false;
QString latestVersion, downloadUrl;
// See if we succeeded
if ( latestReleaseReply->error() == QNetworkReply::NoError )
{
QString latestReleaseInfo = QString::fromUtf8( latestReleaseReply->readLine() ).trimmed();
QStringList parts = latestReleaseInfo.split( ' ' );
if ( parts.size() == 2 )
{
latestVersion = parts[ 0 ];
downloadUrl = parts[ 1 ];
success = true;
}
}
Don't delete latest release reply directly in slot
2013-06-07 12:59:18 +00:00
latestReleaseReply->deleteLater();
latestReleaseReply = 0;
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
if ( !success )
{
// Failed -- reschedule to check in two hours
newReleaseCheckTimer.start( 2 * 60 * 60 * 1000 );
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "Failed to check program version, retry in two hours\n" );
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
}
else
{
// Success -- reschedule for a normal check and save config
cfg.timeForNewReleaseCheck = QDateTime();
prepareNewReleaseChecks();
Config::save( cfg );
Replace printf in code by a macro DPRINTF
2011-06-19 18:50:11 +00:00
DPRINTF( "Program version's check successful, current version is %ls\n",
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
latestVersion.toStdWString().c_str() );
}
+ Possibility to skip the latest release when checking for new releases.
2009-05-14 17:59:49 +00:00
if ( success && latestVersion > PROGRAM_VERSION && latestVersion != cfg.skippedRelease )
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
{
QMessageBox msg( QMessageBox::Information,
tr( "New Release Available" ),
tr( "Version <b>%1</b> of GoldenDict is now available for download.<br>"
"Click <b>Download</b> to get to the download page." ).arg( latestVersion ),
QMessageBox::NoButton,
this );
QPushButton * dload = msg.addButton( tr( "Download" ), QMessageBox::AcceptRole );
+ Possibility to skip the latest release when checking for new releases.
2009-05-14 17:59:49 +00:00
QPushButton * skip = msg.addButton( tr( "Skip This Release" ), QMessageBox::DestructiveRole );
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
msg.addButton( QMessageBox::Cancel );
msg.exec();
if ( msg.clickedButton() == dload )
QDesktopServices::openUrl( QUrl( downloadUrl ) );
+ Possibility to skip the latest release when checking for new releases.
2009-05-14 17:59:49 +00:00
else
if ( msg.clickedButton() == skip )
{
cfg.skippedRelease = latestVersion;
Config::save( cfg );
}
+ Added a feature to automatically check for a new release from time to time.
2009-04-20 19:54:34 +00:00
}
}
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
void MainWindow::trayIconActivated( QSystemTrayIcon::ActivationReason r )
{
added drop-down tab list
2010-09-16 18:52:40 +00:00
switch(r) {
case QSystemTrayIcon::Trigger:
// Left click toggles the visibility of main window
Window activation under Linux again (issue #235)
2013-03-11 12:56:26 +00:00
#ifdef Q_WS_X11
toggleMainWindow( false, true );
#else
added drop-down tab list
2010-09-16 18:52:40 +00:00
toggleMainWindow();
Window activation under Linux again (issue #235)
2013-03-11 12:56:26 +00:00
#endif
added drop-down tab list
2010-09-16 18:52:40 +00:00
break;
The following patches made by Dmitry E. Oboukhov applied: * Middle click on the tray icon translates current selection * Middle click on the main window also translates current selection * When editing groups, double click on the dictionary adds it to the current group.
2009-07-31 11:40:54 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
case QSystemTrayIcon::MiddleClick:
// Middle mouse click on Tray translates selection
// it is functional like as stardict
if ( scanPopup.get() ) {
scanPopup->translateWordFromSelection();
}
break;
default:
break;
The following patches made by Dmitry E. Oboukhov applied: * Middle click on the tray icon translates current selection * Middle click on the main window also translates current selection * When editing groups, double click on the dictionary adds it to the current group.
2009-07-31 11:40:54 +00:00
added drop-down tab list
2010-09-16 18:52:40 +00:00
}
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
}
void MainWindow::scanEnableToggled( bool on )
{
+ Options to configure global hotkeys added. The clipboard hotkey was added. * On X11, XGrabKey was replaced with the RECORD extension -based solution.
2009-04-21 18:27:26 +00:00
if ( !cfg.preferences.enableScanPopup )
return;
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
if ( scanPopup )
{
if ( on )
Mac-specific: Implement scanning under Mac OS X (issue #129)
2013-04-10 13:31:44 +00:00
{
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
scanPopup->enableScanning();
Mac-specific: Implement scanning under Mac OS X (issue #129)
2013-04-10 13:31:44 +00:00
#ifdef Q_OS_MACX
if( !AXAPIEnabled() )
mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
QPixmap( ":/icons/error.png" ) );
#endif
}
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
else
scanPopup->disableScanning();
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
+ Scan popup can now be turned on and off. + Tray icon context menu implemented.
2009-02-08 20:20:02 +00:00
updateTrayIcon();
}
void MainWindow::showMainWindow()
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
{
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
toggleMainWindow( true );
+ Basic preferences and their editing added. + Basic tray icon support added. + Program icon added (one of the Qt Linguist icons, actually).
2009-02-05 20:55:00 +00:00
}
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
void MainWindow::visitHomepage()
{
Update project domain name (goldendict.berlios.de -> goldendict.org)
2010-11-06 19:40:07 +00:00
QDesktopServices::openUrl( QUrl( "http://goldendict.org/" ) );
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
}
New menu item: Help -> Configuration Folder. I'm tired of explaining to users where their configuration folder for GoldenDict is. :)
2011-07-10 07:36:43 +00:00
void MainWindow::openConfigFolder()
{
QDesktopServices::openUrl( QUrl::fromLocalFile( Config::getConfigDir() ) );
}
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
void MainWindow::visitForum()
{
Update project domain name (goldendict.berlios.de -> goldendict.org)
2010-11-06 19:40:07 +00:00
QDesktopServices::openUrl( QUrl( "http://goldendict.org/forum/" ) );
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
}
void MainWindow::showAbout()
{
Implement Credits window in the About dialog to show project contributors. The actual credits file is to be fully populated yet.
2010-11-14 16:28:50 +00:00
About about( this );
* The program version is now propagated to the program; and it now ends up showed in the About dialog.
2009-04-12 22:02:15 +00:00
+ Help menu implemented. + Translations are shown whenever user presses enter or clicks a word in list.
2009-02-08 14:02:27 +00:00
about.show();
about.exec();
}
+ Add 'Show names in dictionary bar' option. This should aid StarDict users since there're no icons in those dictionaries.
2009-10-12 12:41:20 +00:00
void MainWindow::showDictBarNamesTriggered()
{
bool show = showDictBarNamesAction.isChecked();
dictionaryBar.setToolButtonStyle( show ? Qt::ToolButtonTextBesideIcon :
Qt::ToolButtonIconOnly );
cfg.showingDictBarNames = show;
}
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
void MainWindow::useSmallIconsInToolbarsTriggered()
{
bool useSmallIcons = useSmallIconsInToolbarsAction.isChecked();
int extent = useSmallIcons ? QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) :
QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
navToolbar->setIconSize( QSize( extent, extent ) );
Tweaks for the Menu Button size (closes #176).
2013-01-23 13:40:49 +00:00
// additional fix for #176
menuButton->setIconSize( QSize( extent, extent ) );
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
updateDictionaryBar();
cfg.usingSmallIconsInToolbars = useSmallIcons;
Synchronize dicionary icons size in popup and main windows (issue #168)
2013-02-27 13:12:46 +00:00
if( scanPopup.get() )
scanPopup->setDictionaryIconSize();
Option to use small icons in toolbars of main window.
2011-05-22 02:42:05 +00:00
}
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
void MainWindow::toggleMenuBarTriggered(bool announce)
{
Fixed Issue #148: Menubar toggle state is not remembered on program restart.
2013-01-04 21:42:25 +00:00
cfg.preferences.hideMenubar = !toggleMenuBarAction.isChecked();
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
if ( announce )
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
{
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
if ( cfg.preferences.hideMenubar )
{
mainStatusBar->showMessage(
Reimplemented the status bar as internal widget instead of top-level borderless window. Now the status bar behavior is much more reliable on X11 systems, no more lags when moving GoldenDict window around or when resizing it. Works better with compositing window managers as well. Also, the new status bar also supports images, which is good for warnings and error messages. The status bar is fully styled and can change its appearence based on user's CSS, if needed.
2011-07-09 11:55:44 +00:00
tr( "You have chosen to hide a menubar. Use %1 to show it back." )
.arg( QString( "<b>%1</b>" ) ).arg( tr( "Ctrl+M" ) ),
10000,
QPixmap( ":/icons/warning.png" ) );
Chrome-style statusbar for GoldenDict. * Small pop-up window at the bottom of the main winodw instead of traditional status bar, that consumes lots of space. * API, similar to standard Qt's status bar. * The status bar hides itself after specified amount of time. * Clicking on the status bar also hides it. * Properly behavies on resizes/moves/focus/etc. * Tested on Linux and Windows.
2011-06-27 18:54:15 +00:00
}
else
{
mainStatusBar->clearMessage();
}
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
}
Restored the code to add actions from the hidden menu back to the main window. So that if Menu Button is hidden (or the whole toolbar is hidden) all the actions would still work, including the one to show the main menu back. One of the possibilities when the Menu Button is hidden is when not all toolbar buttons fit into winow and are being automatically hidden.
2013-01-06 12:42:18 +00:00
// Obtain from the menubar all the actions with shortcuts
// and either add them to the main window or remove them,
// depending on the menubar state.
QList<QMenu *> allMenus = menuBar()->findChildren<QMenu *>();
QListIterator<QMenu *> menuIter( allMenus );
while( menuIter.hasNext() )
{
QMenu * menu = menuIter.next();
QList<QAction *> allMenuActions = menu->actions();
QListIterator<QAction *> actionsIter( allMenuActions );
while( actionsIter.hasNext() )
{
QAction * action = actionsIter.next();
if ( !action->shortcut().isEmpty() )
{
if ( cfg.preferences.hideMenubar )
{
// add all menubar actions to the main window,
// before we hide the menubar
addAction( action );
}
else
{
// remove all menubar actions from the main window
removeAction( action );
}
}
}
}
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
menuBar()->setVisible( !cfg.preferences.hideMenubar );
Added a new "Menu Button" when the main menubar is hidden. This button is very similar to Chrome browser's (wrench) button.
2012-12-29 18:46:43 +00:00
beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar);
menuButtonAction->setVisible( cfg.preferences.hideMenubar );
Menubar can be hidden with Ctrl+M shortuct now. Plus, added a menu item to do that, and the status notification.
2011-06-26 11:53:28 +00:00
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_clearHistory_triggered()
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
{
history.clear();
Command "Clear history" really clear saved history
2011-03-30 04:47:55 +00:00
history.save();
+ History of search queries implemented.
2009-10-21 19:37:07 +00:00
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_newTab_triggered()
Added "New Tab" menu, plus corrected copyright headers.
2011-06-25 07:34:28 +00:00
{
addNewTab();
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
void MainWindow::setAutostart(bool autostart)
{
#ifdef Q_OS_WIN32
QSettings reg("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run",
QSettings::NativeFormat);
updated (added libqxt and global shortcut Ctrl-F11; fixed issue with autostart on Vista)
2009-04-19 21:32:18 +00:00
if (autostart) {
QString app_fname = QString("\"%1\"").arg( QCoreApplication::applicationFilePath() );
app_fname.replace("/", "\\");
reg.setValue(QCoreApplication::applicationName(), app_fname);
}
else {
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
reg.remove(QCoreApplication::applicationName());
updated (added libqxt and global shortcut Ctrl-F11; fixed issue with autostart on Vista)
2009-04-19 21:32:18 +00:00
}
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
reg.sync();
#else
// this is for KDE
QString app_fname = QFileInfo(QCoreApplication::applicationFilePath()).baseName();
QString lnk(QDir::homePath()+"/.kde/Autostart/"+app_fname);
if (autostart) {
QFile f(QCoreApplication::applicationFilePath());
f.link(lnk);
} else {
QFile::remove(lnk);
}
#endif
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_actionCloseToTray_triggered()
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
{
* Add back some show/hide behavioural changes, refining them in the process. The global shortcut would now only hide window if there's a tray icon enabled.
2009-04-20 12:25:26 +00:00
toggleMainWindow( !cfg.preferences.enableTrayIcon );
+ Apply autoStart property (patch by Ars) + Close to sysTray menu item (patch by Ars) * Shortcuts and tooltols for menu items (patch by Ars)
2009-04-18 18:47:01 +00:00
}
added zoom buttons
2009-04-30 19:57:25 +00:00
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_pageSetup_triggered()
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
{
Construct printer only when the first printing operation is requested. This speeds up startup and conserves resources, since apparently creating a printer makes it connect to localhost:ipp and do other things. While at it, use high-resolution printing mode instead of the default, which is a screen resolution.
2009-11-11 09:40:32 +00:00
if ( getPrinter().isValid() )
+! Check printer validity before entering Page Setup - this fixes fault when no printer is installed.
2009-05-24 18:51:45 +00:00
{
Construct printer only when the first printing operation is requested. This speeds up startup and conserves resources, since apparently creating a printer makes it connect to localhost:ipp and do other things. While at it, use high-resolution printing mode instead of the default, which is a screen resolution.
2009-11-11 09:40:32 +00:00
QPageSetupDialog dialog( &getPrinter(), this );
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
+! Check printer validity before entering Page Setup - this fixes fault when no printer is installed.
2009-05-24 18:51:45 +00:00
dialog.exec();
}
else
QMessageBox::critical( this, tr( "Page Setup" ),
tr( "No printer is available. Please install one first." ) );
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_printPreview_triggered()
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
{
Construct printer only when the first printing operation is requested. This speeds up startup and conserves resources, since apparently creating a printer makes it connect to localhost:ipp and do other things. While at it, use high-resolution printing mode instead of the default, which is a screen resolution.
2009-11-11 09:40:32 +00:00
QPrintPreviewDialog dialog( &getPrinter(), this );
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
connect( &dialog, SIGNAL( paintRequested( QPrinter * ) ),
this, SLOT( printPreviewPaintRequested( QPrinter * ) ) );
Fixed #225: Tiny print preview window in Windows 7
2013-02-27 23:37:36 +00:00
dialog.showMaximized();
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
dialog.exec();
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_print_triggered()
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
{
Construct printer only when the first printing operation is requested. This speeds up startup and conserves resources, since apparently creating a printer makes it connect to localhost:ipp and do other things. While at it, use high-resolution printing mode instead of the default, which is a screen resolution.
2009-11-11 09:40:32 +00:00
QPrintDialog dialog( &getPrinter(), this );
a bit more icons
2009-05-02 21:46:43 +00:00
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
dialog.setWindowTitle( tr( "Print Article") );
a bit more icons
2009-05-02 21:46:43 +00:00
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
if ( dialog.exec() != QDialog::Accepted )
return;
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->print( &getPrinter() );
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
}
void MainWindow::printPreviewPaintRequested( QPrinter * printer )
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
view->print( printer );
+ Printing support implemented.
2009-05-01 12:20:33 +00:00
}
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
static void filterAndCollectResources( QString & html, QRegExp & rx, const QString & sep,
const QString & folder, set< QByteArray > & resourceIncluded,
vector< pair< QUrl, QString > > & downloadResources )
{
int pos = 0;
while ( ( pos = rx.indexIn( html, pos ) ) != -1 )
{
QUrl url( rx.cap( 1 ) );
QString host = url.host();
QString resourcePath = QString::fromLatin1( QUrl::toPercentEncoding( url.path(), "/" ) );
if ( !host.startsWith( '/' ) )
host.insert( 0, '/' );
if ( !resourcePath.startsWith( '/' ) )
resourcePath.insert( 0, '/' );
QCryptographicHash hash( QCryptographicHash::Md5 );
hash.addData( rx.cap().toUtf8() );
if ( resourceIncluded.insert( hash.result() ).second )
{
// Gather resouce information (url, filename) to be download later
downloadResources.push_back( pair<QUrl, QString>( url, folder + host + resourcePath ) );
}
// Modify original url, set to the native one
QString newUrl = sep + QDir( folder ).dirName() + host + resourcePath + sep;
html.replace( pos, rx.cap().length(), newUrl );
pos += newUrl.length();
}
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_saveArticle_triggered()
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
{
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView *view = getCurrentArticleView();
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
QString fileName = view->getTitle() + ".html";
QString savePath;
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
if ( cfg.articleSavePath.isEmpty() )
savePath = QDir::homePath();
else
{
savePath = QDir::fromNativeSeparators( cfg.articleSavePath );
if ( !QDir( savePath ).exists() )
savePath = QDir::homePath();
}
a bit more icons
2009-05-02 21:46:43 +00:00
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
QFileDialog::Options options = QFileDialog::HideNameFilterDetails;
QString selectedFilter;
QStringList filters;
filters.push_back( tr( "Article, Complete (*.html)" ) );
filters.push_back( tr( "Article, HTML Only (*.html)" ) );
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
fileName = savePath + "/" + fileName;
fileName = QFileDialog::getSaveFileName( this, tr( "Save Article As" ),
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
fileName,
filters.join( ";;" ),
&selectedFilter, options );
bool complete = ( selectedFilter == filters[ 0 ] );
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
if ( !fileName.isEmpty() )
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
{
a bit more icons
2009-05-02 21:46:43 +00:00
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
QFile file( fileName );
if ( !file.open( QIODevice::WriteOnly ) )
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
{
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
QMessageBox::critical( this, tr( "Error" ),
tr( "Can't save article: %1" ).arg( file.errorString() ) );
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
}
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
else
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
{
Add an option to enable saving resource files with articles (#321)
2013-05-27 11:18:13 +00:00
QString html = view->toHtml();
QFileInfo fi( fileName );
cfg.articleSavePath = QDir::toNativeSeparators( fi.absoluteDir().absolutePath() );
if ( complete )
{
QString folder = fi.absoluteDir().absolutePath() + "/" + fi.baseName() + "_files";
QRegExp rx1( "\"((?:bres|gico|gdau|qrcx)://[^\"]+)\"" );
QRegExp rx2( "'((?:bres|gico|gdau|qrcx)://[^']+)'" );
set< QByteArray > resourceIncluded;
vector< pair< QUrl, QString > > downloadResources;
filterAndCollectResources( html, rx1, "\"", folder, resourceIncluded, downloadResources );
filterAndCollectResources( html, rx2, "'", folder, resourceIncluded, downloadResources );
ArticleSaveProgressDialog * progressDialog = new ArticleSaveProgressDialog( this );
// reserve '1' for saving main html file
int maxVal = 1;
// Pull and save resources to files
for ( vector< pair< QUrl, QString > >::const_iterator i = downloadResources.begin();
i != downloadResources.end(); i++ )
{
vector< ResourceToSaveHandler * > handlerss = view->saveResource( i->first, i->second );
maxVal += handlerss.size();
for ( vector< ResourceToSaveHandler * >::iterator j = handlerss.begin();
j != handlerss.end(); j++ )
{
connect( *j, SIGNAL( done() ), progressDialog, SLOT( perform() ) );
}
}
progressDialog->setLabelText( tr("Saving article...") );
progressDialog->setRange( 0, maxVal );
progressDialog->setValue( 0 );
progressDialog->show();
file.write( html.toUtf8() );
progressDialog->setValue( 1 );
}
else
{
file.write( html.toUtf8() );
}
Use the native OS dialog to save articles, store the save location in a config
2013-04-12 06:57:41 +00:00
}
+ 'Save Article' feature added.
2009-05-01 11:17:29 +00:00
}
}
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_rescanFiles_triggered()
+ Add 'Rescan Files' menu item to ease rescanning when editing dictionaries.
2009-05-08 10:47:34 +00:00
{
hotkeyWrapper.reset(); // No hotkeys while we're editing dictionaries
scanPopup.reset(); // No scan popup either. No one should use dictionaries.
+! Clear group instances before reloading dictionaries. Hopefully this would fix problems under Windows, where only one file mapping can exist.
2009-05-15 12:15:08 +00:00
groupInstances.clear(); // Release all the dictionaries they hold
Clear dictionaries lists before dictionaries rescan
2013-02-19 18:56:05 +00:00
dictionaries.clear();
dictionariesUnmuted.clear();
dictionaryBar.setDictionaries( dictionaries );
+! Clear group instances before reloading dictionaries. Hopefully this would fix problems under Windows, where only one file mapping can exist.
2009-05-15 12:15:08 +00:00
+ Add 'Rescan Files' menu item to ease rescanning when editing dictionaries.
2009-05-08 10:47:34 +00:00
loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
added drop-down tab list
2010-09-16 18:52:40 +00:00
+ Add 'Rescan Files' menu item to ease rescanning when editing dictionaries.
2009-05-08 10:47:34 +00:00
updateGroupList();
makeScanPopup();
installHotKeys();
Reload tabs content and suggestion list after dictionaries rescan (issue #330)
2013-05-30 13:54:47 +00:00
// Reload suggestion list
QString word = translateLine->text();
translateInputChanged( word );
+ Add 'Rescan Files' menu item to ease rescanning when editing dictionaries.
2009-05-08 10:47:34 +00:00
}
Implemented "Always on Top" functionality. This feature has been frequently requested by various users.
2012-12-29 11:19:49 +00:00
void MainWindow::on_alwaysOnTop_triggered( bool checked )
{
cfg.preferences.alwaysOnTop = checked;
bool wasVisible = isVisible();
Qt::WindowFlags flags = this->windowFlags();
if (checked)
{
setWindowFlags(flags | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint);
mainStatusBar->showMessage(
tr( "The main window is set to be always on top." ),
10000,
QPixmap( ":/icons/warning.png" ) );
}
else
{
setWindowFlags(flags ^ (Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint));
mainStatusBar->clearMessage();
}
if ( wasVisible )
{
show();
}
installHotKeys();
}
added zoom buttons
2009-04-30 19:57:25 +00:00
void MainWindow::zoomin()
{
cfg.preferences.zoomFactor += 0.1;
applyZoomFactor();
}
void MainWindow::zoomout()
{
cfg.preferences.zoomFactor -= 0.1;
applyZoomFactor();
}
void MainWindow::unzoom()
{
cfg.preferences.zoomFactor = 1;
applyZoomFactor();
}
void MainWindow::applyZoomFactor()
{
Change zoom limit from 3x to 5x
2012-12-03 13:13:13 +00:00
if ( cfg.preferences.zoomFactor >= 5 )
cfg.preferences.zoomFactor = 5;
Set the minimum zoom level from 0.7 to 0.1
2013-03-13 20:19:38 +00:00
else if ( cfg.preferences.zoomFactor <= 0.1 )
cfg.preferences.zoomFactor = 0.1;
some polishing of zooming routines
2009-04-30 22:09:04 +00:00
Change zoom limit from 3x to 5x
2012-12-03 13:13:13 +00:00
zoomIn->setEnabled( cfg.preferences.zoomFactor < 5 );
Set the minimum zoom level from 0.7 to 0.1
2013-03-13 20:19:38 +00:00
zoomOut->setEnabled( cfg.preferences.zoomFactor > 0.1 );
some polishing of zooming routines
2009-04-30 22:09:04 +00:00
zoomBase->setEnabled( cfg.preferences.zoomFactor != 1.0 );
added zoom buttons
2009-04-30 19:57:25 +00:00
for ( int i = 0; i < ui.tabWidget->count(); i++ )
{
ArticleView & view =
dynamic_cast< ArticleView & >( *( ui.tabWidget->widget(i) ) );
view.setZoomFactor( cfg.preferences.zoomFactor );
}
+ Apply zoom factor to the scan popup as well.
2009-04-30 20:20:05 +00:00
if ( scanPopup.get() )
scanPopup->applyZoomFactor();
added zoom buttons
2009-04-30 19:57:25 +00:00
}
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
void MainWindow::doWordsZoomIn()
{
++cfg.preferences.wordsZoomLevel;
applyWordsZoomLevel();
}
void MainWindow::doWordsZoomOut()
{
--cfg.preferences.wordsZoomLevel;
applyWordsZoomLevel();
}
void MainWindow::doWordsZoomBase()
{
cfg.preferences.wordsZoomLevel = 0;
applyWordsZoomLevel();
}
void MainWindow::applyWordsZoomLevel()
{
QFont font( wordListDefaultFont );
int ps = font.pointSize();
if ( cfg.preferences.wordsZoomLevel != 0 )
{
ps += cfg.preferences.wordsZoomLevel;
if ( ps < 1 )
ps = 1;
font.setPointSize( ps );
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( wordList->font().pointSize() != ps )
wordList->setFont( font );
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
font = translateLineDefaultFont;
ps = font.pointSize();
if ( cfg.preferences.wordsZoomLevel != 0 )
{
ps += cfg.preferences.wordsZoomLevel;
if ( ps < 1 )
ps = 1;
font.setPointSize( ps );
}
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
if ( translateLine->font().pointSize() != ps )
translateLine->setFont( font );
groupList->setFont(font);
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
wordsZoomBase->setEnabled( cfg.preferences.wordsZoomLevel != 0 );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
// groupList->setFixedHeight(translateLine->height());
groupList->parentWidget()->layout()->activate();
Add support for zooming fonts in word list and translate line.
2010-07-02 11:19:02 +00:00
}
Switch to QtSingleApplication for maintaining single instance running. This should put an end to all those pidfile-related problems.
2010-11-20 13:43:55 +00:00
void MainWindow::messageFromAnotherInstanceReceived( QString const & message )
{
if ( message == "bringToFront" )
Add translation of the word from command line
2011-11-16 13:02:56 +00:00
{
Switch to QtSingleApplication for maintaining single instance running. This should put an end to all those pidfile-related problems.
2010-11-20 13:43:55 +00:00
toggleMainWindow( true );
Add translation of the word from command line
2011-11-16 13:02:56 +00:00
return;
}
if( message.left( 15 ) == "translateWord: " )
{
if( scanPopup.get() )
scanPopup->translateWord( message.mid( 15 ) );
else
wordReceived( message.mid( 15 ) );
}
Switch to QtSingleApplication for maintaining single instance running. This should put an end to all those pidfile-related problems.
2010-11-20 13:43:55 +00:00
else
qWarning() << "Unknown message received from another instance: " << message;
}
Code refactor to get current article view.
2011-07-01 19:22:40 +00:00
ArticleView * MainWindow::getCurrentArticleView()
{
if ( QWidget * cw = ui.tabWidget->currentWidget() )
{
return &( dynamic_cast< ArticleView & >( *( cw ) ) );
}
return 0;
}
1. Add button to scan popup window to send translated word into main window 2. Add option to use main window instead of scan popup window
2011-11-16 12:52:25 +00:00
void MainWindow::wordReceived( const QString & word)
{
toggleMainWindow( true );
Updated UI: Browser-like interface vs search in the sidebar. Users now have a choice: * The new way: The field to enter words located like in all browsers, in the toolbar. * The old way: to search in the sidebar. Both UI modes are supported and can be switched between via View -> Search Pane menu.
2012-12-24 11:30:03 +00:00
translateLine->setText( word );
1. Add button to scan popup window to send translated word into main window 2. Add option to use main window instead of scan popup window
2011-11-16 12:52:25 +00:00
translateInputFinished();
}
Large search history
2012-02-16 14:56:25 +00:00
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
void MainWindow::updateHistoryMenu()
Large search history
2012-02-16 14:56:25 +00:00
{
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
if ( ui.historyPane->toggleViewAction()->isChecked() )
{
ui.showHideHistory->setText( tr( "&Hide" ) );
}
else
{
ui.showHideHistory->setText( tr( "&Show" ) );
}
}
Focus word list in history review mode
2012-09-12 12:32:29 +00:00
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
void MainWindow::on_showHideHistory_triggered()
{
ui.historyPane->toggleViewAction()->trigger();
ui.historyPane->raise(); // useful when the Pane is tabbed.
Large search history
2012-02-16 14:56:25 +00:00
}
Export history to file
2012-02-17 12:01:52 +00:00
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_exportHistory_triggered()
Export history to file
2012-02-17 12:01:52 +00:00
{
Store path for history export/import
2012-09-10 18:00:29 +00:00
QString exportPath;
Little corrections for history handling
2012-09-12 17:19:21 +00:00
if( cfg.historyExportPath.isEmpty() )
Store path for history export/import
2012-09-10 18:00:29 +00:00
exportPath = QDir::homePath();
else
{
Little corrections for history handling
2012-09-12 17:19:21 +00:00
exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
Store path for history export/import
2012-09-10 18:00:29 +00:00
if( !QDir( exportPath ).exists() )
exportPath = QDir::homePath();
}
Export history to file
2012-02-17 12:01:52 +00:00
QString fileName = QFileDialog::getSaveFileName( this, tr( "Export history to file" ),
Store path for history export/import
2012-09-10 18:00:29 +00:00
exportPath,
Export history to file
2012-02-17 12:01:52 +00:00
tr( "Text files (*.txt);;All files (*.*)" ) );
if( fileName.size() == 0)
return;
Little corrections for history handling
2012-09-12 17:19:21 +00:00
cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
Export history to file
2012-02-17 12:01:52 +00:00
QFile file( fileName );
for(;;)
{
if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
break;
// Write UTF-8 BOM
QByteArray line;
line.append( 0xEF ).append( 0xBB ).append( 0xBF );
if ( file.write( line ) != line.size() )
break;
// Write history
QList< History::Item > const & items = history.getItems();
QList< History::Item >::const_iterator i;
for( i = items.constBegin(); i != items.constEnd(); ++i )
{
line = i->word.toUtf8();
line.replace( '\n', ' ' );
line.replace( '\r', ' ' );
line += "\n";
if ( file.write( line ) != line.size() )
break;
}
if( i != items.constEnd() )
break;
file.close();
mainStatusBar->showMessage( tr( "History export complete" ), 5000 );
return;
}
Import history from file
2012-09-10 13:01:35 +00:00
QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
Export history to file
2012-02-17 12:01:52 +00:00
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
}
Import history from file
2012-09-10 13:01:35 +00:00
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
// TODO: consider moving parts of this method into History class.
Renamed Qt3-legacy *_activated() -> *_triggered(). This fixes the problems on pure Qt4-only environments.
2012-12-03 21:57:00 +00:00
void MainWindow::on_importHistory_triggered()
Import history from file
2012-09-10 13:01:35 +00:00
{
Store path for history export/import
2012-09-10 18:00:29 +00:00
QString importPath;
Little corrections for history handling
2012-09-12 17:19:21 +00:00
if( cfg.historyExportPath.isEmpty() )
Store path for history export/import
2012-09-10 18:00:29 +00:00
importPath = QDir::homePath();
else
{
Little corrections for history handling
2012-09-12 17:19:21 +00:00
importPath = QDir::fromNativeSeparators( cfg.historyExportPath );
Store path for history export/import
2012-09-10 18:00:29 +00:00
if( !QDir( importPath ).exists() )
importPath = QDir::homePath();
}
Import history from file
2012-09-10 13:01:35 +00:00
QString fileName = QFileDialog::getOpenFileName( this, tr( "Import history from file" ),
Store path for history export/import
2012-09-10 18:00:29 +00:00
importPath,
Import history from file
2012-09-10 13:01:35 +00:00
tr( "Text files (*.txt);;All files (*.*)" ) );
if( fileName.size() == 0)
return;
Show name of file when history imported in history review mode
2012-09-11 12:58:27 +00:00
QFileInfo fileInfo( fileName );
Little corrections for history handling
2012-09-12 17:19:21 +00:00
cfg.historyExportPath = QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() );
Import history from file
2012-09-10 13:01:35 +00:00
QString errStr;
QFile file( fileName );
for(;;)
{
if ( !file.open( QFile::ReadOnly | QIODevice::Text ) )
break;
QTextStream fileStream( & file );
QString itemStr, trimmedStr;
QList< QString > itemList;
history.clear();
do
{
itemStr = fileStream.readLine();
if( fileStream.status() >= QTextStream::ReadCorruptData )
break;
trimmedStr = itemStr.trimmed();
if( trimmedStr.isEmpty() )
continue;
Make the default history item length to be the same as the limit for the headwords. So, it is 256 now. And configurable via the same parameter in the config file: maxHeadwordSize.
2013-01-17 14:24:13 +00:00
if( (unsigned)trimmedStr.size() <= history.getMaxItemLength( ) )
Import history from file
2012-09-10 13:01:35 +00:00
itemList.prepend( trimmedStr );
} while( !fileStream.atEnd() && itemList.size() < (int)history.getMaxSize() );
Allow history import during history review
2012-09-10 16:23:58 +00:00
history.enableAdd( true );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
Import history from file
2012-09-10 13:01:35 +00:00
for( QList< QString >::const_iterator i = itemList.constBegin(); i != itemList.constEnd(); ++i )
history.addItem( History::Item( 1, *i ) );
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
history.enableAdd( cfg.preferences.storeHistory );
Import history from file
2012-09-10 13:01:35 +00:00
if( file.error() != QFile::NoError )
break;
if( fileStream.status() >= QTextStream::ReadCorruptData )
{
errStr = QString ( tr( "Import error: invalid data in file" ) );
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
}
else
mainStatusBar->showMessage( tr( "History import complete" ), 5000 );
return;
}
errStr = QString( tr( "Import error: " ) ) + file.errorString();
file.close();
mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.png" ) );
}
Allow history import during history review
2012-09-10 16:23:58 +00:00
void MainWindow::fillWordListFromHistory()
{
ui.wordList->setUpdatesEnabled( false );
ui.wordList->clear();
QList< History::Item > const & items = history.getItems();
for( int x = 0; x < items.size(); ++x )
{
History::Item const * i = &items[ x ];
QListWidgetItem * s = new QListWidgetItem( i->word, ui.wordList );
if (s->text().at(0).direction() == QChar::DirR)
s->setTextAlignment(Qt::AlignRight);
if (s->text().at(0).direction() == QChar::DirL)
s->setTextAlignment(Qt::AlignLeft);
ui.wordList->addItem( s );
}
ui.wordList->setUpdatesEnabled( true );
}
Focus word list in history review mode
2012-09-12 12:32:29 +00:00
void MainWindow::focusWordList()
{
if( ui.wordList->count() > 0 )
ui.wordList->setFocus();
}
Add word to history through context menu
2012-09-12 14:11:30 +00:00
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
void MainWindow::addWordToHistory( const QString & word )
{
History Pane rewrite. The new History Pane features proper mouse and keyboard navigation, multiple selection and ability to remove the selected entries, plus a dynamic context menu. Additionaly, the History's size is now configurable in Preferences. Use Ctrl+H to show/hide the History Pane. History Pane's titlebar can be styled via #historyPaneTitleBar, e.g.: /* Colored header for the History Pane */ background: lightsteelblue; margin: 2px; } Closes #162: Make History sidebar independent from the Search Pane Closes #159: "Send to main window" button from Pop-Up window does nothing when History is shown Closes #158: Preserve History mode after restart Closes #157: History with new UI: New words are not added when History is shown Closes #156: History with new UI: Extra Groups widget in History is shown Closes #155: History with new UI: Arrow keys navigation in History doesn't work Closes #154: History with new UI: DEL key does not delete the current history entry
2013-01-17 09:08:53 +00:00
history.addItem( History::Item( 1, word.trimmed() ) );
Update history when clicking links on page (issue #120)
2012-11-12 13:52:54 +00:00
}
Add word to history through context menu
2012-09-12 14:11:30 +00:00
void MainWindow::forceAddWordToHistory( const QString & word )
{
history.enableAdd( true );
history.addItem( History::Item( 1, word.trimmed() ) );
history.enableAdd( cfg.preferences.storeHistory );
}
Show/hide optional parts of articles (DSL dictionaries only)
2012-09-16 10:19:47 +00:00
void MainWindow::setExpandMode( bool expand )
{
articleMaker.setExpandOptionalParts( expand );
}
void MainWindow::switchExpandOptionalPartsMode()
{
ArticleView * view = getCurrentArticleView();
if( view )
view->switchExpandOptionalParts();
}
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
Show information about a dictionary on rigth mouse click in "Found in" pane
2012-09-24 12:51:51 +00:00
void MainWindow::foundDictsPaneClicked( QListWidgetItem * item )
Ctrl(Shift)+Click on "Found in dictionaries" pane do same action as on dictionary toolbar
2012-09-19 12:44:36 +00:00
{
if ( QApplication::keyboardModifiers() &
( Qt::ControlModifier | Qt::ShiftModifier ) )
{
QString id = item->data( Qt::UserRole ).toString();
emit clickOnDictPane( id );
}
}
Add "Dictionary info" item to dictionary bar context menu
2012-09-25 13:13:35 +00:00
void MainWindow::showDictionaryInfo( const QString & id )
{
for( unsigned x = 0; x < dictionaries.size(); x++ )
{
if( dictionaries[ x ]->getId() == id.toUtf8().data() )
{
Show dictionary info on right click in groups edit dialog
2012-12-20 13:25:03 +00:00
DictInfo infoMsg( cfg, this );
Add "Dictionary info" item to dictionary bar context menu
2012-09-25 13:13:35 +00:00
infoMsg.showInfo( dictionaries[ x ] );
Add "Edit dictionary" and "Open folder" buttons to the Dictionary Info dialog Note: The "Edit dictionary" is optional an enabled only if the command line for editor is specified in the config file (manually).
2013-06-11 15:40:45 +00:00
int result = infoMsg.exec();
if ( result == DictInfo::OPEN_FOLDER )
{
openDictionaryFolder( id );
}
else if ( result == DictInfo::EDIT_DICTIONARY)
{
Refactoring the edit dictionary functionality a bit
2013-06-11 19:31:58 +00:00
editDictionary( dictionaries[x].get() );
Add "Edit dictionary" and "Open folder" buttons to the Dictionary Info dialog Note: The "Edit dictionary" is optional an enabled only if the command line for editor is specified in the config file (manually).
2013-06-11 15:40:45 +00:00
}
Add "Dictionary info" item to dictionary bar context menu
2012-09-25 13:13:35 +00:00
break;
}
}
}
Refactoring the edit dictionary functionality a bit
2013-06-11 19:31:58 +00:00
void MainWindow::editDictionary( Dictionary::Class * dict )
Add "Edit dictionary" and "Open folder" buttons to the Dictionary Info dialog Note: The "Edit dictionary" is optional an enabled only if the command line for editor is specified in the config file (manually).
2013-06-11 15:40:45 +00:00
{
QString dictFilename = dict->getMainFilename();
if( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() )
{
QString command( cfg.editDictionaryCommandLine );
command.replace( "%GDDICT%", "\"" + dictFilename + "\"" );
if( !QProcess::startDetached( command ) )
QApplication::beep();
}
}
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
void MainWindow::openDictionaryFolder( const QString & id )
{
for( unsigned x = 0; x < dictionaries.size(); x++ )
{
if( dictionaries[ x ]->getId() == id.toUtf8().data() )
{
if( dictionaries[ x ]->getDictionaryFilenames().size() > 0 )
{
QString fileName = FsEncoding::decode( dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str() );
Win-specific: Select in Explorer the main dictionary file when opening the dictionary folder
2013-06-11 10:11:10 +00:00
bool explorerLaunched = false;
// Platform-dependent way to launch a file explorer and to select a file,
// currently only on Windows.
#if defined(Q_OS_WIN)
if ( !QFileInfo( fileName ).isDir() )
{
QString param = QLatin1String("explorer.exe ")
+ QLatin1String("/select, \"") + QDir::toNativeSeparators( fileName ) + QLatin1String("\"");
qDebug() << "Launching" << param;
// We use CreateProcess() directly instead of QProcess::startDetached() since
// startDetached() does some evil things with quotes breaking explorer arguments.
// E.g., the following file cannot be properly selected via startDetached(), due to equals sign,
// which explorer considers as separator:
// Z:\GoldenDict\content\-=MDict=-\Test.mdx
PROCESS_INFORMATION pinfo;
STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
(ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
explorerLaunched = CreateProcess(0, (wchar_t*) param.utf16(),
0, 0, FALSE, CREATE_UNICODE_ENVIRONMENT | CREATE_NEW_CONSOLE, 0,
0, &startupInfo, &pinfo);
if ( explorerLaunched ) {
CloseHandle( pinfo.hThread );
CloseHandle( pinfo.hProcess );
}
}
#endif
if ( !explorerLaunched )
{
QString folder = QFileInfo( fileName ).absoluteDir().absolutePath();
if( !folder.isEmpty() )
Fix open dictionary folder action
2013-06-11 12:52:10 +00:00
QDesktopServices::openUrl( QUrl::fromLocalFile( folder ) );
Win-specific: Select in Explorer the main dictionary file when opening the dictionary folder
2013-06-11 10:11:10 +00:00
}
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
}
break;
}
}
}
Show information about a dictionary on rigth mouse click in "Found in" pane
2012-09-24 12:51:51 +00:00
void MainWindow::foundDictsContextMenuRequested( const QPoint &pos )
{
QListWidgetItem *item = ui.dictsList->itemAt( pos );
if( item )
{
QString id = item->data( Qt::UserRole ).toString();
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
Dictionary::Class *pDict = NULL;
Fix commit e6457a1e (enable edit only dsl and xdxf dictionaries)
2012-11-29 17:12:54 +00:00
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
for( unsigned i = 0; i < dictionaries.size(); i++ )
Fix commit e6457a1e (enable edit only dsl and xdxf dictionaries)
2012-11-29 17:12:54 +00:00
{
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
if( id.compare( dictionaries[ i ]->getId().c_str() ) == 0 )
Fix commit e6457a1e (enable edit only dsl and xdxf dictionaries)
2012-11-29 17:12:54 +00:00
{
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
pDict = dictionaries[ i ].get();
break;
Fix commit e6457a1e (enable edit only dsl and xdxf dictionaries)
2012-11-29 17:12:54 +00:00
}
}
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
if( pDict == NULL )
return;
if( !pDict->isLocalDictionary() )
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
{
Fix crash when right clicking dicts list if scan pop is disabled
2013-05-30 15:45:20 +00:00
if ( scanPopup )
scanPopup.get()->blockSignals( true );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
showDictionaryInfo( id );
Fix crash when right clicking dicts list if scan pop is disabled
2013-05-30 15:45:20 +00:00
if ( scanPopup )
scanPopup.get()->blockSignals( false );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
}
else
{
QMenu menu( ui.dictsList );
QAction * infoAction = menu.addAction( tr( "Dictionary info" ) );
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
QAction * openDictFolderAction = menu.addAction( tr( "Open dictionary folder" ) );
QAction * editAction = NULL;
QString dictFilename = pDict->getMainFilename();
if( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() )
editAction = menu.addAction( tr( "Edit dictionary" ) );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
QAction * result = menu.exec( ui.dictsList->mapToGlobal( pos ) );
if( result && result == infoAction )
{
Fix crash when right clicking dicts list if scan pop is disabled
2013-05-30 15:45:20 +00:00
if ( scanPopup )
scanPopup.get()->blockSignals( true );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
showDictionaryInfo( id );
Fix crash when right clicking dicts list if scan pop is disabled
2013-05-30 15:45:20 +00:00
if ( scanPopup )
scanPopup.get()->blockSignals( false );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
}
else
"Open dictionary folder" action in context menu (issue #344)
2013-06-09 13:31:57 +00:00
if( result && result == openDictFolderAction )
{
openDictionaryFolder( id );
}
else
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
if( result && result == editAction )
{
Refactoring the edit dictionary functionality a bit
2013-06-11 19:31:58 +00:00
editDictionary( pDict );
Call external editor for dictionaries
2012-11-28 19:32:37 +00:00
}
}
Show information about a dictionary on rigth mouse click in "Found in" pane
2012-09-24 12:51:51 +00:00
}
}
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
void MainWindow::sendWordToInputLine( const QString & word )
{
Minor bugfixes for the new UI mode.
2012-12-25 10:12:13 +00:00
translateLine->clear();
translateLine->setText( word );
Send word to input line via context menu
2012-11-26 13:13:13 +00:00
}
Save images and sounds via context menu (issue #223)
2013-02-22 12:44:23 +00:00
void MainWindow::storeResourceSavePath( const QString & newPath )
{
cfg.resourceSavePath = newPath;
}
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#ifdef Q_OS_WIN32
bool MainWindow::winEvent( MSG * message, long * result )
{
if( message->message != gdAskMessage )
return false;
*result = 0;
ArticleView * view = getCurrentArticleView();
if( !view )
return true;
LPGDDataStruct lpdata = ( LPGDDataStruct ) message->lParam;
QString str = view->wordAtPoint( lpdata->Pt.x, lpdata->Pt.y );
memset( lpdata->cwData, 0, lpdata->dwMaxLength * sizeof( WCHAR ) );
Win-specific: Properly scan right-to-left words in GD window
2013-01-26 14:49:02 +00:00
if( str.isRightToLeft() )
{
gd::wstring wstr = gd::toWString( str );
wstr.assign( wstr.rbegin(), wstr.rend() );
str = gd::toQString( wstr );
}
str.truncate( lpdata->dwMaxLength - 1 );
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
str.toWCharArray( lpdata->cwData );
*result = 1;
return true;
}
Win-specific: Show translation in popup window istead of sending word to GD main window while scanning GD main window
2012-09-24 13:20:58 +00:00
bool MainWindow::isGoldenDictWindow( HWND hwnd )
{
return hwnd == (HWND)winId();
}
Win-specific: Scan popup now work in GoldenDict article tabs
2012-09-18 23:01:31 +00:00
#endif
Copy permalink