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

Fixed #143: Make the new UI mode the default one.

Browse source
This commit is contained in:
Tvangeste 2013-01-05 12:26:55 +01:00
parent 09bc4b46bd
commit 9ad4da4cb5
4 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.cc
View file

@ -95,6 +95,7 @@ Preferences::Preferences():
selectWordBySingleClick( false ),
escKeyHidesMainWindow( false ),
alwaysOnTop ( false ),
searchInDock ( false ),
enableMainWindowHotkey( true ),
mainWindowHotkey( QKeySequence( "Ctrl+F11,F11" ) ),
@ -615,6 +616,7 @@ Class load() throw( exError )
c.preferences.closeToTray = ( preferences.namedItem( "closeToTray" ).toElement().text() == "1" );
c.preferences.autoStart = ( preferences.namedItem( "autoStart" ).toElement().text() == "1" );
c.preferences.alwaysOnTop = ( preferences.namedItem( "alwaysOnTop" ).toElement().text() == "1" );
c.preferences.searchInDock = ( preferences.namedItem( "searchInDock" ).toElement().text() == "1" );
if ( !preferences.namedItem( "doubleClickTranslates" ).isNull() )
c.preferences.doubleClickTranslates = ( preferences.namedItem( "doubleClickTranslates" ).toElement().text() == "1" );
@ -1274,6 +1276,10 @@ void save( Class const & c ) throw( exError )
opt.appendChild( dd.createTextNode( c.preferences.alwaysOnTop ? "1" : "0" ) );
preferences.appendChild( opt );
opt = dd.createElement( "searchInDock" );
opt.appendChild( dd.createTextNode( c.preferences.searchInDock ? "1" : "0" ) );
preferences.appendChild( opt );
{
QDomElement proxy = dd.createElement( "proxyserver" );
preferences.appendChild( proxy );

4
config.hh
View file

@ -160,6 +160,10 @@ struct Preferences
bool escKeyHidesMainWindow;
bool alwaysOnTop;
/// An old UI mode when tranlateLine and wordList
/// are in the dockable side panel, not on the toolbar.
bool searchInDock;
bool enableMainWindowHotkey;
HotKey mainWindowHotkey;
bool enableClipboardHotkey;

33
mainwindow.cc
View file

@ -73,7 +73,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
articleNetMgr( this, dictionaries, articleMaker,
cfg.preferences.disallowContentFromOtherSites ),
dictNetMgr( this ),
searchInDock( false ),
wordFinder( this ),
newReleaseCheckTimer( this ),
wordListSelChanged( false )
@ -195,10 +194,10 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
searchPaneTitleBar.setLayout( &searchPaneTitleBarLayout );
ui.searchPane->setTitleBarWidget( &searchPaneTitleBar );
connect( ui.searchPane, SIGNAL( visibilityChanged( bool ) ),
this, SLOT( updateSearchPaneAndBar() ) );
connect( ui.searchPane->toggleViewAction(), SIGNAL( triggered( bool ) ),
this, SLOT( updateSearchPaneAndBar( bool ) ) );
if (searchInDock)
if ( cfg.preferences.searchInDock )
{
groupList = groupListInDock;
translateLine = ui.translateLine;
@ -595,6 +594,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
if ( cfg.mainWindowState.size() )
restoreState( cfg.mainWindowState, 1 );
updateSearchPaneAndBar( cfg.preferences.searchInDock );
ui.searchPane->setVisible( cfg.preferences.searchInDock );
applyProxySettings();
applyWebSettings();
@ -682,12 +684,11 @@ void MainWindow::ctrlTabPressed()
tabListButton->click();
}
void MainWindow::updateSearchPaneAndBar()
void MainWindow::updateSearchPaneAndBar( bool searchInDock )
{
if ( ui.searchPane->isVisible() )
if ( searchInDock )
{
searchInDock = true;
cfg.preferences.searchInDock = true;
groupList = groupListInDock;
translateLine = ui.translateLine;
@ -701,7 +702,7 @@ void MainWindow::updateSearchPaneAndBar()
}
else
{
searchInDock = false;
cfg.preferences.searchInDock = false;
groupList = groupListInToolbar;
translateLine = translateBox->translateLine();
@ -1774,7 +1775,7 @@ void MainWindow::translateInputFinished( bool checkModifiers )
showTranslationFor( word );
if ( searchInDock )
if ( cfg.preferences.searchInDock )
{
if ( ui.searchPane->isFloating() )
activateWindow();
@ -1818,7 +1819,7 @@ void MainWindow::handleShiftF3()
void MainWindow::focusTranslateLine()
{
if ( searchInDock )
if ( cfg.preferences.searchInDock )
{
if ( ui.searchPane->isFloating() )
ui.searchPane->activateWindow();
@ -1952,7 +1953,7 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
// when the main window is moved or resized, hide the word list suggestions
if ( obj == this && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) )
{
if ( !searchInDock )
if ( !cfg.preferences.searchInDock )
{
wordList->hide();
return false;
@ -1990,7 +1991,7 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
{
QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
if (searchInDock)
if ( cfg.preferences.searchInDock )
{
if ( keyEvent->matches( QKeySequence::MoveToNextLine ) && wordList->count() )
{
@ -2035,7 +2036,7 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
if ( keyEvent->matches( QKeySequence::InsertParagraphSeparator ) &&
wordList->selectedItems().size() )
{
if ( searchInDock )
if ( cfg.preferences.searchInDock )
{
if ( ui.searchPane->isFloating() )
activateWindow();
@ -2043,7 +2044,7 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
getCurrentArticleView()->focus();
return searchInDock;
return cfg.preferences.searchInDock;
}
if( showHistory && keyEvent->matches( QKeySequence::Delete ) && ui.wordList->count() )
@ -2208,7 +2209,7 @@ void MainWindow::typingEvent( QString const & t )
}
else
{
if ( ( searchInDock && ui.searchPane->isFloating() ) || ui.dictsPane->isFloating() )
if ( ( cfg.preferences.searchInDock && ui.searchPane->isFloating() ) || ui.dictsPane->isFloating() )
ui.searchPane->activateWindow();
if( translateLine->isEnabled() )

6
mainwindow.hh
View file

@ -133,10 +133,6 @@ private:
// since their requests can be destroyed
// in a separate thread
/// An old UI mode when tranlateLine and wordList
/// are in the dockable side panel, not on the toolbar.
bool searchInDock;
QListWidget * wordList;
QLineEdit * translateLine;
@ -381,7 +377,7 @@ private slots:
void on_alwaysOnTop_triggered( bool checked );
void focusWordList();
void updateSearchPaneAndBar();
void updateSearchPaneAndBar( bool searchInDock );
/// Add word to history
void addWordToHistory( const QString & word );