Merge 3c5233f2a1 into 160402e1d0

This reverts commit 1272ea2d20a7908b9a69d6b551511916f97cc024.

icons/README.txt

@@ -1,79 +1,79 @@
-issue: https://github.com/goldendict/goldendict/issues/1441
-
-http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
-list:
-internet.svg
-home.svg
-configure.svg
-fileopen.svg
-addtab.svg
-wizard.svg
-fulltext
-text2speech
-reload 
-icons/print.svg
-icons/programs.svg
-error
-star.svg
-star_blue.svg
-network.svg
-hotkeys
-previous
-next
-advanced
-windows-list
-filesave
-playsound_color
-interface
-webdict
-transliteration
-closetab
-folder
-reload
-menu.svg
-
-https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
-lists:
-clear
-
-https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
-lists:
-icon32_sdict.svg 
-
-
-https://freesvg.org/pushpin-vector-image  public domain 
-lists:
-pushbin
-
-
-https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
-lists:
-1downarrow
-
-
-these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
-playsound.png
-playsound_full.png
-
-
-LGPL
-icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
-icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
-icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
-reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
-advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
-sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
-
-book.svg https://github.com/johnfactotum/foliate
-
-
-lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
-
-
-Apache License Version 2.0
-1downarrow.svg
-system-search.svg
-Modified from  https://github.com/google/material-design-icons
-
-add-anki-icon.svg   MIT license
+issue: https://github.com/goldendict/goldendict/issues/1441
+
+http://tango.freedesktop.org/Tango_Desktop_Project GPLv3
+list:
+internet.svg
+home.svg
+configure.svg
+fileopen.svg
+addtab.svg
+wizard.svg
+fulltext
+text2speech
+reload 
+icons/print.svg
+icons/programs.svg
+error
+star.svg
+star_blue.svg
+network.svg
+hotkeys
+previous
+next
+advanced
+windows-list
+filesave
+playsound_color
+interface
+webdict
+transliteration
+closetab
+folder
+reload
+menu.svg
+
+https://packages.debian.org/bullseye/gnome-icon-theme GPLv3
+lists:
+clear
+
+https://commons.wikimedia.org/wiki/File:Accessories-dictionary.svg
+lists:
+icon32_sdict.svg 
+
+
+https://freesvg.org/pushpin-vector-image  public domain 
+lists:
+pushbin
+
+
+https://commons.wikimedia.org/wiki/File:Arrow_bottom_svg.svg  license:public domain
+lists:
+1downarrow
+
+
+these two icons from sertoli @  https://forum.freemdict.com/u/sertoli/summary
+playsound.png
+playsound_full.png
+
+
+LGPL
+icon32_zoombase.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-page-zoom-icon.png
+icon32_zoomout.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-out-icon.png
+icon32_zoomin.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-zoom-in-icon.png
+reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-edit-redo-icon.html
+advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
+sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
+
+book.svg https://github.com/johnfactotum/foliate
+
+
+lingualibre.svg https://en.m.wikipedia.org/wiki/File:Lingualibre-logo-no-text.svg
+
+
+Apache License Version 2.0
+1downarrow.svg
+system-search.svg
+Modified from  https://github.com/google/material-design-icons
+
+add-anki-icon.svg   MIT license
 https://www.svgrepo.com/svg/435992/add-card

src/audio/README.md

@@ -0,0 +1,3 @@
+Code to support GD's internal/external audio players.
+
+Only `audioplayerinterface.hh` is supposed to be used outside this folder.

src/config.cc

@@ -111,7 +111,7 @@ HotKey::HotKey( QKeySequence const & seq ):
 
 QKeySequence HotKey::toKeySequence() const
 {
-  if ( key2 != 0 || key2 != Qt::Key::Key_unknown ) {
+  if ( key2 != 0 && key2 != Qt::Key::Key_unknown ) {
     return { QKeyCombination( modifiers, static_cast< Qt::Key >( key1 ) ),
              QKeyCombination( modifiers, static_cast< Qt::Key >( key2 ) ) };
   }

src/dict/loaddictionaries.cc

@@ -224,7 +224,7 @@ void loadDictionaries( QWidget * parent,
 
   loadDicts.wait();
 
-  if ( loadDicts.getExceptionText().size() ) {
+  if ( !loadDicts.getExceptionText().empty() ) {
     QMessageBox::critical( parent,
                            QCoreApplication::translate( "LoadDictionaries", "Error loading dictionaries" ),
                            QString::fromUtf8( loadDicts.getExceptionText().c_str() ) );

src/instances.cc

@@ -53,9 +53,8 @@ Group::Group( Config::Group const & cfgGroup,
   }
 }
 
-Group::Group( QString name_ ):
-  id( 0 ),
-  name( std::move( name_ ) )
+Group::Group():
+  id( 0 )
 {
 }
 

src/instances.hh

@@ -32,7 +32,7 @@ struct Group
          Config::Group const & inactiveGroup );
 
   /// Creates an empty group.
-  explicit Group( QString name_ );
+  explicit Group();
 
   Group( unsigned id, QString name_ );
 

src/ui/articleview.hh

@@ -10,7 +10,7 @@
 #include <QWebEngineView>
 #include <list>
 #include "article_netmgr.hh"
-#include "audioplayerinterface.hh"
+#include "audio/audioplayerinterface.hh"
 #include "instances.hh"
 #include "groupcombobox.hh"
 #include "globalbroadcaster.hh"

src/ui/editdictionaries.cc

@@ -200,32 +200,17 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
 #ifndef NO_TTS_SUPPORT
   cfg.voiceEngines = sources.getVoiceEngines();
 #endif
-  ui.tabs->setUpdatesEnabled( false );
+  setUpdatesEnabled( false );
   // Those hold pointers to dictionaries, we need to free them.
   groupInstances.clear();
 
-  groups.clear();
-  orderAndProps.clear();
-
   loadDictionaries( this, cfg, dictionaries, dictNetMgr );
 
-  Instances::updateNames( savedGroups, dictionaries );
-  Instances::updateNames( savedOrder, dictionaries );
-  Instances::updateNames( savedInactive, dictionaries );
-
   if ( rebuildGroups ) {
-    ui.tabs->removeTab( 1 );
-    ui.tabs->removeTab( 1 );
-
-    orderAndProps = new OrderAndProps( this, savedOrder, savedInactive, dictionaries );
-    groups        = new Groups( this, dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
-
-    ui.tabs->insertTab( 1, orderAndProps, QIcon( ":/icons/book.svg" ), tr( "&Dictionaries" ) );
-    ui.tabs->insertTab( 2, groups, QIcon( ":/icons/bookcase.svg" ), tr( "&Groups" ) );
-    connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
-    connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords );
+    orderAndProps->rebuild( savedOrder, savedInactive, dictionaries );
+    groups->rebuild( dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
   }
-  ui.tabs->setUpdatesEnabled( true );
+  setUpdatesEnabled( true );
 }
 EditDictionaries::~EditDictionaries()
 {

src/ui/groups.cc

@@ -64,6 +64,24 @@ Groups::Groups( QWidget * parent,
   countChanged();
 }
 
+void Groups::rebuild( vector< sptr< Dictionary::Class > > const & dicts_,
+                      Config::Groups const & groups_,
+                      Config::Group const & order )
+{
+  this->setUpdatesEnabled( false );
+  dicts  = dicts_;
+  groups = groups_;
+
+  ui.dictionaries->setAsSource();
+  ui.dictionaries->populate( Instances::Group( order, dicts, Config::Group() ).dictionaries, dicts );
+
+  // Populate groups' widget
+  ui.groups->populate( groups, dicts, ui.dictionaries->getCurrentDictionaries() );
+
+  countChanged();
+  this->setUpdatesEnabled( true );
+}
+
 void Groups::editGroup( unsigned id )
 {
   for ( int x = 0; x < groups.size(); ++x ) {

src/ui/groups.hh

@@ -18,7 +18,9 @@ public:
           std::vector< sptr< Dictionary::Class > > const &,
           Config::Groups const &,
           Config::Group const & order );
-
+  void rebuild( std::vector< sptr< Dictionary::Class > > const & dicts_,
+                Config::Groups const & groups_,
+                Config::Group const & order );
   /// Instructs the dialog to position itself on editing the given group.
   void editGroup( unsigned id );
 
@@ -31,7 +33,7 @@ public:
 
 private:
   Ui::Groups ui;
-  std::vector< sptr< Dictionary::Class > > const & dicts;
+  std::vector< sptr< Dictionary::Class > > dicts;
   Config::Groups groups;
 
   QToolButton * groupsListButton;

src/ui/groups_widgets.cc

@@ -122,7 +122,7 @@ void DictGroupWidget::groupIconActivated( int index )
 
 Config::Group DictGroupWidget::makeGroup() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.id = groupId;
 

src/ui/mainwindow.hh

@@ -14,7 +14,7 @@
 #include "config.hh"
 #include "dict/dictionary.hh"
 #include "article_netmgr.hh"
-#include "audioplayerfactory.hh"
+#include "audio/audioplayerfactory.hh"
 #include "instances.hh"
 #include "article_maker.hh"
 #include "scanpopup.hh"

src/ui/orderandprops.cc

@@ -133,9 +133,28 @@ OrderAndProps::OrderAndProps( QWidget * parent,
   showDictNumbers();
 }
 
+void OrderAndProps::rebuild( Config::Group const & dictionaryOrder,
+                             Config::Group const & inactiveDictionaries,
+                             std::vector< sptr< Dictionary::Class > > const & allDictionaries )
+{
+  Instances::Group order( dictionaryOrder, allDictionaries, Config::Group() );
+  Instances::Group inactive( inactiveDictionaries, allDictionaries, Config::Group() );
+
+  Instances::complementDictionaryOrder( order, inactive, allDictionaries );
+
+  setUpdatesEnabled( false );
+  ui.dictionaryOrder->populate( order.dictionaries, allDictionaries );
+  ui.inactiveDictionaries->populate( inactive.dictionaries, allDictionaries );
+
+  disableDictionaryDescription();
+
+  showDictNumbers();
+  setUpdatesEnabled( true );
+}
+
 Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.dictionaryOrder->getCurrentDictionaries();
 
@@ -144,7 +163,7 @@ Config::Group OrderAndProps::getCurrentDictionaryOrder() const
 
 Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
 {
-  Instances::Group g( "" );
+  Instances::Group g;
 
   g.dictionaries = ui.inactiveDictionaries->getCurrentDictionaries();
 

src/ui/orderandprops.hh

@@ -17,7 +17,9 @@ public:
                  Config::Group const & dictionaryOrder,
                  Config::Group const & inactiveDictionaries,
                  std::vector< sptr< Dictionary::Class > > const & allDictionaries );
-
+  void rebuild( Config::Group const & dictionaryOrder,
+                Config::Group const & inactiveDictionaries,
+                std::vector< sptr< Dictionary::Class > > const & allDictionaries );
   Config::Group getCurrentDictionaryOrder() const;
   Config::Group getCurrentInactiveDictionaries() const;