Merge pull request #853 from ra3xdh/852_fix

Fix Qucs-S fresh start #852
ra3xdh · Jul 21, 2024 · 040dbbd · 040dbbd
2 parents 6ca42f0 + d7c075e
commit 040dbbd
Show file tree

Hide file tree

Showing 157 changed files with 9 additions and 140 deletions.
diff --git a/qucs/bitmaps/dark/EKV26nMOS.png b/qucs/bitmaps/dark/EKV26nMOS.png
diff --git a/qucs/bitmaps/dark/EKV26pMOS.png b/qucs/bitmaps/dark/EKV26pMOS.png
diff --git a/qucs/bitmaps/dark/ac.png b/qucs/bitmaps/dark/ac.png
diff --git a/qucs/bitmaps/dark/ac_current.png b/qucs/bitmaps/dark/ac_current.png
diff --git a/qucs/bitmaps/dark/ac_voltage.png b/qucs/bitmaps/dark/ac_voltage.png
diff --git a/qucs/bitmaps/dark/am_mod.png b/qucs/bitmaps/dark/am_mod.png
diff --git a/qucs/bitmaps/dark/amplifier.png b/qucs/bitmaps/dark/amplifier.png
diff --git a/qucs/bitmaps/dark/and.png b/qucs/bitmaps/dark/and.png
diff --git a/qucs/bitmaps/dark/andor4x2.png b/qucs/bitmaps/dark/andor4x2.png
diff --git a/qucs/bitmaps/dark/andor4x3.png b/qucs/bitmaps/dark/andor4x3.png
diff --git a/qucs/bitmaps/dark/andor4x4.png b/qucs/bitmaps/dark/andor4x4.png
diff --git a/qucs/bitmaps/dark/attenuator.png b/qucs/bitmaps/dark/attenuator.png
diff --git a/qucs/bitmaps/dark/biast.png b/qucs/bitmaps/dark/biast.png
diff --git a/qucs/bitmaps/dark/binarytogrey4bit.png b/qucs/bitmaps/dark/binarytogrey4bit.png
diff --git a/qucs/bitmaps/dark/bondwire.png b/qucs/bitmaps/dark/bondwire.png
diff --git a/qucs/bitmaps/dark/buffer.png b/qucs/bitmaps/dark/buffer.png
diff --git a/qucs/bitmaps/dark/capacitor.png b/qucs/bitmaps/dark/capacitor.png
diff --git a/qucs/bitmaps/dark/cccs.png b/qucs/bitmaps/dark/cccs.png
diff --git a/qucs/bitmaps/dark/ccvs.png b/qucs/bitmaps/dark/ccvs.png
diff --git a/qucs/bitmaps/dark/circulator.png b/qucs/bitmaps/dark/circulator.png
diff --git a/qucs/bitmaps/dark/coaxial.png b/qucs/bitmaps/dark/coaxial.png
diff --git a/qucs/bitmaps/dark/comp_1bit.png b/qucs/bitmaps/dark/comp_1bit.png
diff --git a/qucs/bitmaps/dark/comp_2bit.png b/qucs/bitmaps/dark/comp_2bit.png
diff --git a/qucs/bitmaps/dark/comp_4bit.png b/qucs/bitmaps/dark/comp_4bit.png
diff --git a/qucs/bitmaps/dark/coplanar.png b/qucs/bitmaps/dark/coplanar.png
diff --git a/qucs/bitmaps/dark/coupler.png b/qucs/bitmaps/dark/coupler.png
diff --git a/qucs/bitmaps/dark/cpwgap.png b/qucs/bitmaps/dark/cpwgap.png
diff --git a/qucs/bitmaps/dark/cpwopen.png b/qucs/bitmaps/dark/cpwopen.png
diff --git a/qucs/bitmaps/dark/cpwshort.png b/qucs/bitmaps/dark/cpwshort.png
diff --git a/qucs/bitmaps/dark/cpwstep.png b/qucs/bitmaps/dark/cpwstep.png
diff --git a/qucs/bitmaps/dark/ctline.png b/qucs/bitmaps/dark/ctline.png
diff --git a/qucs/bitmaps/dark/dc.png b/qucs/bitmaps/dark/dc.png
diff --git a/qucs/bitmaps/dark/dc_current.png b/qucs/bitmaps/dark/dc_current.png
diff --git a/qucs/bitmaps/dark/dc_voltage.png b/qucs/bitmaps/dark/dc_voltage.png
diff --git a/qucs/bitmaps/dark/dcblock.png b/qucs/bitmaps/dark/dcblock.png
diff --git a/qucs/bitmaps/dark/dcfeed.png b/qucs/bitmaps/dark/dcfeed.png
diff --git a/qucs/bitmaps/dark/dff_SR.png b/qucs/bitmaps/dark/dff_SR.png
diff --git a/qucs/bitmaps/dark/diac.png b/qucs/bitmaps/dark/diac.png
diff --git a/qucs/bitmaps/dark/digi.png b/qucs/bitmaps/dark/digi.png
diff --git a/qucs/bitmaps/dark/diode.png b/qucs/bitmaps/dark/diode.png
diff --git a/qucs/bitmaps/dark/dmosfet.png b/qucs/bitmaps/dark/dmosfet.png
diff --git a/qucs/bitmaps/dark/dmosfet_sub.png b/qucs/bitmaps/dark/dmosfet_sub.png
diff --git a/qucs/bitmaps/dark/dmux2to4.png b/qucs/bitmaps/dark/dmux2to4.png
diff --git a/qucs/bitmaps/dark/dmux3to8.png b/qucs/bitmaps/dark/dmux3to8.png
diff --git a/qucs/bitmaps/dark/dmux4to16.png b/qucs/bitmaps/dark/dmux4to16.png
diff --git a/qucs/bitmaps/dark/ecvs.png b/qucs/bitmaps/dark/ecvs.png
diff --git a/qucs/bitmaps/dark/edd.png b/qucs/bitmaps/dark/edd.png
diff --git a/qucs/bitmaps/dark/equation.png b/qucs/bitmaps/dark/equation.png
diff --git a/qucs/bitmaps/dark/fa1b.png b/qucs/bitmaps/dark/fa1b.png
diff --git a/qucs/bitmaps/dark/fa2b.png b/qucs/bitmaps/dark/fa2b.png
diff --git a/qucs/bitmaps/dark/gatedDlatch.png b/qucs/bitmaps/dark/gatedDlatch.png
diff --git a/qucs/bitmaps/dark/gnd.png b/qucs/bitmaps/dark/gnd.png
diff --git a/qucs/bitmaps/dark/greytobinary4bit.png b/qucs/bitmaps/dark/greytobinary4bit.png
diff --git a/qucs/bitmaps/dark/ground.png b/qucs/bitmaps/dark/ground.png
diff --git a/qucs/bitmaps/dark/gyrator.png b/qucs/bitmaps/dark/gyrator.png
diff --git a/qucs/bitmaps/dark/ha1b.png b/qucs/bitmaps/dark/ha1b.png
diff --git a/qucs/bitmaps/dark/hb.png b/qucs/bitmaps/dark/hb.png
diff --git a/qucs/bitmaps/dark/hpribin4bit.png b/qucs/bitmaps/dark/hpribin4bit.png
diff --git a/qucs/bitmaps/dark/hybrid.png b/qucs/bitmaps/dark/hybrid.png
diff --git a/qucs/bitmaps/dark/iexp.png b/qucs/bitmaps/dark/iexp.png
diff --git a/qucs/bitmaps/dark/inductor.png b/qucs/bitmaps/dark/inductor.png
diff --git a/qucs/bitmaps/dark/inverter.png b/qucs/bitmaps/dark/inverter.png
diff --git a/qucs/bitmaps/dark/iprobe.png b/qucs/bitmaps/dark/iprobe.png
diff --git a/qucs/bitmaps/dark/ipulse.png b/qucs/bitmaps/dark/ipulse.png
diff --git a/qucs/bitmaps/dark/irect.png b/qucs/bitmaps/dark/irect.png
diff --git a/qucs/bitmaps/dark/isolator.png b/qucs/bitmaps/dark/isolator.png
diff --git a/qucs/bitmaps/dark/jkff_SR.png b/qucs/bitmaps/dark/jkff_SR.png
diff --git a/qucs/bitmaps/dark/jkflipflop.png b/qucs/bitmaps/dark/jkflipflop.png
diff --git a/qucs/bitmaps/dark/log_amp.png b/qucs/bitmaps/dark/log_amp.png
diff --git a/qucs/bitmaps/dark/mscorner.png b/qucs/bitmaps/dark/mscorner.png
diff --git a/qucs/bitmaps/dark/mscoupled.png b/qucs/bitmaps/dark/mscoupled.png
diff --git a/qucs/bitmaps/dark/mscross.png b/qucs/bitmaps/dark/mscross.png
diff --git a/qucs/bitmaps/dark/msgap.png b/qucs/bitmaps/dark/msgap.png
diff --git a/qucs/bitmaps/dark/msline.png b/qucs/bitmaps/dark/msline.png
diff --git a/qucs/bitmaps/dark/msmbend.png b/qucs/bitmaps/dark/msmbend.png
diff --git a/qucs/bitmaps/dark/msopen.png b/qucs/bitmaps/dark/msopen.png
diff --git a/qucs/bitmaps/dark/msrstub.png b/qucs/bitmaps/dark/msrstub.png
diff --git a/qucs/bitmaps/dark/msstep.png b/qucs/bitmaps/dark/msstep.png
diff --git a/qucs/bitmaps/dark/mstee.png b/qucs/bitmaps/dark/mstee.png
diff --git a/qucs/bitmaps/dark/msvia.png b/qucs/bitmaps/dark/msvia.png
diff --git a/qucs/bitmaps/dark/mutual.png b/qucs/bitmaps/dark/mutual.png
diff --git a/qucs/bitmaps/dark/mutual2.png b/qucs/bitmaps/dark/mutual2.png
diff --git a/qucs/bitmaps/dark/mux2to1.png b/qucs/bitmaps/dark/mux2to1.png
diff --git a/qucs/bitmaps/dark/mux4to1.png b/qucs/bitmaps/dark/mux4to1.png
diff --git a/qucs/bitmaps/dark/mux8to1.png b/qucs/bitmaps/dark/mux8to1.png
diff --git a/qucs/bitmaps/dark/nand.png b/qucs/bitmaps/dark/nand.png
diff --git a/qucs/bitmaps/dark/nfet.png b/qucs/bitmaps/dark/nfet.png
diff --git a/qucs/bitmaps/dark/nigbt.png b/qucs/bitmaps/dark/nigbt.png
diff --git a/qucs/bitmaps/dark/nmosfet.png b/qucs/bitmaps/dark/nmosfet.png
diff --git a/qucs/bitmaps/dark/nmosfet_sub.png b/qucs/bitmaps/dark/nmosfet_sub.png
diff --git a/qucs/bitmaps/dark/noise_current.png b/qucs/bitmaps/dark/noise_current.png
diff --git a/qucs/bitmaps/dark/noise_ii.png b/qucs/bitmaps/dark/noise_ii.png
diff --git a/qucs/bitmaps/dark/noise_iv.png b/qucs/bitmaps/dark/noise_iv.png
diff --git a/qucs/bitmaps/dark/noise_volt.png b/qucs/bitmaps/dark/noise_volt.png
diff --git a/qucs/bitmaps/dark/noise_vv.png b/qucs/bitmaps/dark/noise_vv.png
diff --git a/qucs/bitmaps/dark/nor.png b/qucs/bitmaps/dark/nor.png
diff --git a/qucs/bitmaps/dark/npn.png b/qucs/bitmaps/dark/npn.png
diff --git a/qucs/bitmaps/dark/npn_therm.png b/qucs/bitmaps/dark/npn_therm.png
diff --git a/qucs/bitmaps/dark/npnsub.png b/qucs/bitmaps/dark/npnsub.png
diff --git a/qucs/bitmaps/dark/npnsub_therm.png b/qucs/bitmaps/dark/npnsub_therm.png
diff --git a/qucs/bitmaps/dark/opamp.png b/qucs/bitmaps/dark/opamp.png
diff --git a/qucs/bitmaps/dark/or.png b/qucs/bitmaps/dark/or.png
diff --git a/qucs/bitmaps/dark/pfet.png b/qucs/bitmaps/dark/pfet.png
diff --git a/qucs/bitmaps/dark/pm_mod.png b/qucs/bitmaps/dark/pm_mod.png
diff --git a/qucs/bitmaps/dark/pmosfet.png b/qucs/bitmaps/dark/pmosfet.png
diff --git a/qucs/bitmaps/dark/pmosfet_sub.png b/qucs/bitmaps/dark/pmosfet_sub.png
diff --git a/qucs/bitmaps/dark/pnp.png b/qucs/bitmaps/dark/pnp.png
diff --git a/qucs/bitmaps/dark/port.png b/qucs/bitmaps/dark/port.png
diff --git a/qucs/bitmaps/dark/potentiometer.png b/qucs/bitmaps/dark/potentiometer.png
diff --git a/qucs/bitmaps/dark/pshifter.png b/qucs/bitmaps/dark/pshifter.png
diff --git a/qucs/bitmaps/dark/rectline.png b/qucs/bitmaps/dark/rectline.png
diff --git a/qucs/bitmaps/dark/relais.png b/qucs/bitmaps/dark/relais.png
diff --git a/qucs/bitmaps/dark/resistor.png b/qucs/bitmaps/dark/resistor.png
diff --git a/qucs/bitmaps/dark/resistor_us.png b/qucs/bitmaps/dark/resistor_us.png
diff --git a/qucs/bitmaps/dark/rfedd.png b/qucs/bitmaps/dark/rfedd.png
diff --git a/qucs/bitmaps/dark/rlcg.png b/qucs/bitmaps/dark/rlcg.png
diff --git a/qucs/bitmaps/dark/rsflipflop.png b/qucs/bitmaps/dark/rsflipflop.png
diff --git a/qucs/bitmaps/dark/source.png b/qucs/bitmaps/dark/source.png
diff --git a/qucs/bitmaps/dark/spfile1.png b/qucs/bitmaps/dark/spfile1.png
diff --git a/qucs/bitmaps/dark/spfile2.png b/qucs/bitmaps/dark/spfile2.png
diff --git a/qucs/bitmaps/dark/spfile3.png b/qucs/bitmaps/dark/spfile3.png
diff --git a/qucs/bitmaps/dark/subcircuit.png b/qucs/bitmaps/dark/subcircuit.png
diff --git a/qucs/bitmaps/dark/subport.png b/qucs/bitmaps/dark/subport.png
diff --git a/qucs/bitmaps/dark/substrate.png b/qucs/bitmaps/dark/substrate.png
diff --git a/qucs/bitmaps/dark/sweep.png b/qucs/bitmaps/dark/sweep.png
diff --git a/qucs/bitmaps/dark/switch.png b/qucs/bitmaps/dark/switch.png
diff --git a/qucs/bitmaps/dark/symtrans.png b/qucs/bitmaps/dark/symtrans.png
diff --git a/qucs/bitmaps/dark/tff_SR.png b/qucs/bitmaps/dark/tff_SR.png
diff --git a/qucs/bitmaps/dark/thyristor.png b/qucs/bitmaps/dark/thyristor.png
diff --git a/qucs/bitmaps/dark/tline.png b/qucs/bitmaps/dark/tline.png
diff --git a/qucs/bitmaps/dark/tline_4port.png b/qucs/bitmaps/dark/tline_4port.png
diff --git a/qucs/bitmaps/dark/tran.png b/qucs/bitmaps/dark/tran.png
diff --git a/qucs/bitmaps/dark/transformer.png b/qucs/bitmaps/dark/transformer.png
diff --git a/qucs/bitmaps/dark/triac.png b/qucs/bitmaps/dark/triac.png
diff --git a/qucs/bitmaps/dark/tunneldiode.png b/qucs/bitmaps/dark/tunneldiode.png
diff --git a/qucs/bitmaps/dark/twistedpair.png b/qucs/bitmaps/dark/twistedpair.png
diff --git a/qucs/bitmaps/dark/vccs.png b/qucs/bitmaps/dark/vccs.png
diff --git a/qucs/bitmaps/dark/vcresistor.png b/qucs/bitmaps/dark/vcresistor.png
diff --git a/qucs/bitmaps/dark/vcvs.png b/qucs/bitmaps/dark/vcvs.png
diff --git a/qucs/bitmaps/dark/vexp.png b/qucs/bitmaps/dark/vexp.png
diff --git a/qucs/bitmaps/dark/vfile.png b/qucs/bitmaps/dark/vfile.png
diff --git a/qucs/bitmaps/dark/vhdlfile.png b/qucs/bitmaps/dark/vhdlfile.png
diff --git a/qucs/bitmaps/dark/vprobe.png b/qucs/bitmaps/dark/vprobe.png
diff --git a/qucs/bitmaps/dark/vpulse.png b/qucs/bitmaps/dark/vpulse.png
diff --git a/qucs/bitmaps/dark/vrect.png b/qucs/bitmaps/dark/vrect.png
diff --git a/qucs/bitmaps/dark/xnor.png b/qucs/bitmaps/dark/xnor.png
diff --git a/qucs/bitmaps/dark/xor.png b/qucs/bitmaps/dark/xor.png
diff --git a/qucs/dialogs/qucssettingsdialog.cpp b/qucs/dialogs/qucssettingsdialog.cpp
@@ -166,19 +166,6 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
     appSettingsGrid->addWidget(checkFullTraceNames,12,1);
     checkFullTraceNames->setChecked(QucsSettings.fullTraceName);
 
-    QStringList lst_icons;
-    lst_icons<<"Automatic"<<"Light"<<"Dark";
-    PanelIconsCombo = new QComboBox;
-    PanelIconsCombo->addItems(lst_icons);
-    PanelIconsCombo->setCurrentIndex(QucsSettings.panelIconsTheme);
-    appSettingsGrid->addWidget(new QLabel(tr("Panel icons theme (set after reload):"),appSettingsTab),13,0);
-    appSettingsGrid->addWidget(PanelIconsCombo,13,1);
-    CompIconsCombo = new QComboBox;
-    CompIconsCombo->addItems(lst_icons);
-    CompIconsCombo->setCurrentIndex(QucsSettings.compIconsTheme);
-    appSettingsGrid->addWidget(new QLabel(tr("Components icons theme (set after reload):"),appSettingsTab),14,0);
-    appSettingsGrid->addWidget(CompIconsCombo,14,1);
-
     t->addTab(appSettingsTab, tr("Settings"));
 
     // ...........................................................
@@ -594,9 +581,6 @@ void QucsSettingsDialog::slotApply()
     QucsSettings.appFont = AppFont;
     QucsSettings.textFont = TextFont;
 
-    QucsSettings.panelIconsTheme = PanelIconsCombo->currentIndex();
-    QucsSettings.compIconsTheme = CompIconsCombo->currentIndex();
-
     QucsSettings.Language =
         LanguageCombo->currentText().section('(',1,1).remove(')');
 
@@ -795,9 +779,6 @@ void QucsSettingsDialog::slotDefaultValues()
     LargeFontSizeEdit->setText(QString::number(16.0));
 
     LanguageCombo->setCurrentIndex(0);
-
-    PanelIconsCombo->setCurrentIndex(0);
-    CompIconsCombo->setCurrentIndex(0);
 
     p = BGColorButton->palette();
     p.setColor(BGColorButton->backgroundRole(), QColor(255,250,225));

diff --git a/qucs/dialogs/qucssettingsdialog.h b/qucs/dialogs/qucssettingsdialog.h
@@ -88,7 +88,6 @@ private slots:
               *checkAntiAliasing, *checkTextAntiAliasing,
               *checkFullTraceNames;
     QComboBox *LanguageCombo;
-    QComboBox *PanelIconsCombo, *CompIconsCombo;
     QPushButton *FontButton, *AppFontButton, *TextFontButton, *BGColorButton;
     QLineEdit *LargeFontSizeEdit, *undoNumEdit, *editorEdit, *Input_Suffix,
               *Input_Program, *homeEdit, *admsXmlEdit, *ascoEdit, *octaveEdit,

diff --git a/qucs/main.cpp b/qucs/main.cpp
@@ -100,9 +100,6 @@ bool loadSettings()
     QucsSettings.Directive = _settings::Get().item<QString>("Directive");
     QucsSettings.Task = _settings::Get().item<QString>("Task");
 
-    QucsSettings.panelIconsTheme = _settings::Get().item<int>("panelIconsTheme");
-    QucsSettings.compIconsTheme = _settings::Get().item<int>("compIconsTheme");
-
     // TODO: Convert this to the new settings model.
     if(settings.contains("Qucsator")) {
         QucsSettings.Qucsator = settings.value("Qucsator").toString();
@@ -147,11 +144,6 @@ bool loadSettings()
     QucsSettings.GraphAntiAliasing = _settings::Get().item<bool>("GraphAntiAliasing");
     QucsSettings.TextAntiAliasing = _settings::Get().item<bool>("TextAntiAliasing");
     QucsSettings.fullTraceName = _settings::Get().item<bool>("fullTraceName");
-    QucsSettings.FileToolbar = _settings::Get().item<bool>("FileToolbar");
-    QucsSettings.EditToolbar = _settings::Get().item<bool>("EditToolbar");
-    QucsSettings.ViewToolbar = _settings::Get().item<bool>("ViewToolbar");
-    QucsSettings.WorkToolbar = _settings::Get().item<bool>("WorkToolbar");
-    QucsSettings.SimulateToolbar = _settings::Get().item<bool>("SimulateToolbar");
     QucsSettings.RecentDocs = _settings::Get().item<QString>("RecentDocs").split("*",qucs::SkipEmptyParts);
     QucsSettings.numRecentDocs = QucsSettings.RecentDocs.count();
     QucsSettings.spiceExtensions << "*.sp" << "*.cir" << "*.spc" << "*.spi";
@@ -224,13 +216,6 @@ bool saveApplSettings()
     qs.setItem<bool>("GraphAntiAliasing", QucsSettings.GraphAntiAliasing);
     qs.setItem<bool>("TextAntiAliasing", QucsSettings.TextAntiAliasing);
     qs.setItem<bool>("fullTraceName",QucsSettings.fullTraceName);
-    qs.setItem<int>("panelIconsTheme",QucsSettings.panelIconsTheme);
-    qs.setItem<int>("compIconsTheme",QucsSettings.compIconsTheme);
-    qs.setItem<bool>("FileToolbar", QucsSettings.FileToolbar);
-    qs.setItem<bool>("EditToolbar", QucsSettings.EditToolbar);
-    qs.setItem<bool>("ViewToolbar", QucsSettings.ViewToolbar);
-    qs.setItem<bool>("WorkToolbar", QucsSettings.WorkToolbar);
-    qs.setItem<bool>("SimulateToolbar", QucsSettings.SimulateToolbar);
 
     // Copy the list of directory paths in which Qucs should
     // search for subcircuit schematics from qucsPathList

diff --git a/qucs/main.h b/qucs/main.h
@@ -34,17 +34,9 @@ class VersionTriplet;
 
 static const double pi = 3.1415926535897932384626433832795029;  /* pi   */
 
-namespace qucs {
-enum iconType { panelIcons = 0, compIcons = 1 };
-enum iconTheme { autoIcons = 0, lightIcons = 1, darkIcons = 2 };
-}
-
 struct tQucsSettings {
   int DefaultSimulator;
 
-  int panelIconsTheme;
-  int compIconsTheme;
-
   QFont font;
   QFont appFont;
   QFont textFont;
@@ -113,12 +105,6 @@ struct tQucsSettings {
   bool hasDarkTheme;
   bool fullTraceName;
 
-  bool FileToolbar;
-  bool EditToolbar;
-  bool ViewToolbar;
-  bool WorkToolbar;
-  bool SimulateToolbar;
-
   bool firstRun;
 };
 

diff --git a/qucs/misc.cpp b/qucs/misc.cpp
@@ -65,48 +65,14 @@ bool misc::isDarkTheme()
     return is_dark_theme;
 }
 
-QString misc::getIconPath(const QString &file, int icon_type)
+QString misc::getIconPath(const QString &file)
 {
-    auto icons_theme = QucsSettings.panelIconsTheme;
-    switch (icon_type) {
-    case qucs::panelIcons:
-        icons_theme = QucsSettings.panelIconsTheme;
-        break;
-    case qucs::compIcons:
-        icons_theme = QucsSettings.compIconsTheme;
-        break;
-    }
-
-    bool loadDark = false;
-    switch (icons_theme) {
-    case qucs::autoIcons:
-        loadDark = QucsSettings.hasDarkTheme;
-        break;
-    case qucs::darkIcons:
-        loadDark = true;
-        break;
-    case qucs::lightIcons:
-        loadDark = false;
-        break;
-    }
-
     QString icon_path =":bitmaps/svg/"; // look for svg version first
-    if (loadDark) {
-        QString icon_path_dark = ":bitmaps/svg/dark/";
-        if (QFileInfo::exists(icon_path_dark + file + ".svg"))
-            icon_path = icon_path_dark;
-    }
     icon_path += file + ".svg";
     if (QFile::exists(icon_path)) {
         return icon_path;
     }
-
     icon_path =":bitmaps/";
-    if (loadDark) {
-        QString icon_path_dark = ":bitmaps/dark/";
-        if (QFileInfo::exists(icon_path_dark + file + ".png"))
-            icon_path = icon_path_dark;
-    }
     icon_path += file + ".png";
     return icon_path;
 }

diff --git a/qucs/misc.h b/qucs/misc.h
@@ -85,7 +85,7 @@ namespace misc {
     }
 
   QStringList parseCmdArgs(const QString &program);
-  QString getIconPath(const QString &file, int icon_type);
+  QString getIconPath(const QString &file);
   bool isDarkTheme();
   QString getWindowTitle();
   QString wildcardToRegularExpression(const QString &wc_str, const bool enableEscaping);

diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp
@@ -148,20 +148,12 @@ QucsApp::QucsApp()
   fillSimulatorsComboBox();
   initToolBar();
   initStatusBar();
-  viewToolBar->setChecked(true);
-  viewStatusBar->setChecked(true);
   viewBrowseDock->setChecked(true);
   slotViewOctaveDock(false);
   slotUpdateRecentFiles();
   initCursorMenu();
   //Module::registerModules ();
 
-  fileToolbar->setVisible(QucsSettings.FileToolbar);
-  editToolbar->setVisible(QucsSettings.EditToolbar);
-  viewToolbar->setVisible(QucsSettings.ViewToolbar);
-  workToolbar->setVisible(QucsSettings.WorkToolbar);
-  simulateToolbar->setVisible(QucsSettings.SimulateToolbar);
-
   // instance of small text search dialog
   SearchDia = new SearchDialog(this);
   TuningMode = false;
@@ -871,7 +863,7 @@ void QucsApp::slotSetCompView (int index)
       if (Infos) {
         /// \todo warning: expression result unused, can we rewrite this?
         (void) *((*it)->info) (Name, File, false);
-        QString icon_path = misc::getIconPath(QString (File), qucs::compIcons);
+        QString icon_path = misc::getIconPath(QString (File));
         QListWidgetItem *icon = new QListWidgetItem(Name);
         if (QFileInfo::exists(icon_path)) {
             icon->setIcon(QPixmap(icon_path));
@@ -933,7 +925,7 @@ void QucsApp::slotSearchComponent(const QString &searchText)
 
           if((Name.indexOf(searchText, 0, Qt::CaseInsensitive)) != -1) {
             //match
-            QString icon_path = misc::getIconPath(QString (File), qucs::compIcons);
+            QString icon_path = misc::getIconPath(QString (File));
             QListWidgetItem *icon = new QListWidgetItem(Name);
             if (QFileInfo::exists(icon_path)) {
                 icon->setIcon(QPixmap(icon_path));
@@ -2235,11 +2227,6 @@ void QucsApp::closeEvent(QCloseEvent* Event)
 // Saves settings
 void QucsApp::saveSettings()
 {
-  QucsSettings.FileToolbar = fileToolbar->isVisible();
-  QucsSettings.EditToolbar = editToolbar->isVisible();
-  QucsSettings.ViewToolbar = viewToolbar->isVisible();
-  QucsSettings.WorkToolbar = workToolbar->isVisible();
-  QucsSettings.SimulateToolbar = simulateToolbar->isVisible();
   saveApplSettings();
 }
 

diff --git a/qucs/qucs.h b/qucs/qucs.h
@@ -302,8 +302,6 @@ public slots:
   void slotUpdateRedo(bool);  // update redo available state
 
 private slots:
-  void slotViewToolBar(bool toggle);    // toggle the toolbar
-  void slotViewStatusBar(bool toggle);  // toggle the statusbar
   void slotViewBrowseDock(bool toggle); // toggle the dock window
   void slotViewOctaveDock(bool); // toggle the dock window
   void slotToggleOctave(bool);
@@ -316,7 +314,7 @@ private slots:
   void initToolBar();    // creates the toolbars
   void initStatusBar();  // setup the statusbar
 
-  QAction *helpAboutApp, *helpAboutQt, *viewToolBar, *viewStatusBar,
+  QAction *helpAboutApp, *helpAboutQt,
           *viewBrowseDock, *viewOctaveDock;
 
   // menus contain the items of their menubar

diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp
@@ -611,19 +611,6 @@ void QucsApp::initActions()
   //buildIFS = new QAction(tr("Build XSPICE IFS file from subcircuit"),this);
   //connect(buildIFS,SIGNAL(triggered()),SLOT(slotBuildXSPICEIfs()));
 
-
-  viewToolBar = new QAction(tr("Tool&bar"), this);
-  viewToolBar->setCheckable(true);
-  viewToolBar->setStatusTip(tr("Enables/disables the toolbar"));
-  viewToolBar->setWhatsThis(tr("Toolbar\n\nEnables/disables the toolbar"));
-  connect(viewToolBar, SIGNAL(toggled(bool)), SLOT(slotViewToolBar(bool)));
-
-  viewStatusBar = new QAction(tr("&Statusbar"), this);
-  viewStatusBar->setCheckable(true);
-  viewStatusBar->setStatusTip(tr("Enables/disables the statusbar"));
-  viewStatusBar->setWhatsThis(tr("Statusbar\n\nEnables/disables the statusbar"));
-  connect(viewStatusBar, SIGNAL(toggled(bool)), SLOT(slotViewStatusBar(bool)));
-
   viewBrowseDock = new QAction(tr("&Dock Window"), this);
   viewBrowseDock->setCheckable(true);
   viewBrowseDock->setStatusTip(tr("Enables/disables the browse dock window"));
@@ -808,8 +795,6 @@ void QucsApp::initMenuBar()
   viewMenu->addAction(setDiagramLimits);
   viewMenu->addSeparator();
   //viewMenu->setCheckable(true);
-  viewMenu->addAction(viewToolBar);
-  viewMenu->addAction(viewStatusBar);
   viewMenu->addAction(viewBrowseDock);
   viewMenu->addAction(viewOctaveDock);
 
@@ -1041,24 +1026,6 @@ void QucsApp::slotUpdateRedo(bool isEnabled)
   redo->setEnabled(isEnabled);
 }
 
-// ----------------------------------------------------------
-// turn Toolbar on or off
-void QucsApp::slotViewToolBar(bool toggle)
-{
-  fileToolbar->setVisible(toggle);
-  editToolbar->setVisible(toggle);
-  viewToolbar->setVisible(toggle);
-  workToolbar->setVisible(toggle);
-  simulateToolbar->setVisible(toggle);
-}
-
-// ----------------------------------------------------------
-// turn Statusbar on or off
-void QucsApp::slotViewStatusBar(bool toggle)
-{
-  statusBar()->setVisible(toggle);
-}
-
 // ----------------------------------------------------------
 // turn Browse Dock Window on or off
 void QucsApp::slotViewBrowseDock(bool toggle)

diff --git a/qucs/settings.cpp b/qucs/settings.cpp
@@ -1,4 +1,5 @@
 #include <QApplication>
+#include <QStandardPaths>
 
 #include "main.h"
 #include "settings.h"
@@ -44,13 +45,12 @@ void settingsManager::resetDefaults(const QString &group)
 void settingsManager::initDefaults()
 {
     m_Defaults["DefaultSimulator"] = spicecompat::simNotSpecified;
-    m_Defaults["FirstRun"] = true;
+    m_Defaults["firstRun"] = true;
     m_Defaults["font"] = QApplication::font();
     m_Defaults["appFont"] = QApplication::font();
     m_Defaults["LargeFontSize"] = static_cast<double>(16.0);
     m_Defaults["maxUndo"] = 20;
-    m_Defaults["panelIconsTheme"] = qucs::autoIcons;
-    m_Defaults["compIconsTheme"] = qucs::autoIcons;
+    m_Defaults["QucsHomeDir"] = QDir::homePath() + QDir::toNativeSeparators("/QucsWorkspace");
 
 #ifdef Q_OS_WIN
     m_Defaults["NgspiceExecutable"] = "ngspice_con.exe";
@@ -63,7 +63,7 @@ void settingsManager::initDefaults()
 #endif
 
     m_Defaults["XyceParExecutable"] = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
-    m_Defaults["S4Q_workdir"] = "";
+    m_Defaults["S4Q_workdir"] = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
     m_Defaults["Nprocs"] = 4;
     m_Defaults["SpiceOpusExecutable"] = "spiceopus";
     m_Defaults["SimParameters"] = "";