Perfect dark: remove explict Qt widget coloring

xiaoyifang · Dec 25, 2022 · 587aad1 · 587aad1
1 parent 7d6b6cc
commit 587aad1
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 451 deletions.
diff --git a/mainwindow.cc b/mainwindow.cc
@@ -445,7 +445,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) );
   closeCurrentTabAction.setText( tr("Close current tab") );
-  closeCurrentTabAction.setIcon( QIcon(":/icons/closetab-hover.png") );
 
   connect( &closeCurrentTabAction, SIGNAL( triggered() ),
            this, SLOT( closeCurrentTab() ) );
@@ -1226,13 +1225,11 @@ void MainWindow::applyQtStyleSheet( QString const & displayStyle, QString const
   css += macCssFile.readAll();
 #endif
 
-  if ( displayStyle.size() )
-  {
-    // Load an additional stylesheet
-    QFile builtInCssFile( QString( ":/qt-style-st-%1.css" ).arg( displayStyle ) );
-    if ( builtInCssFile.open( QFile::ReadOnly ) )
-      css += builtInCssFile.readAll();
-  }
+#if defined(Q_OS_WIN)
+  QFile winCssFile( ":/qt-style-win.css" );
+  winCssFile.open( QFile::ReadOnly );
+  css += winCssFile.readAll();
+#endif
 
   // Try loading a style sheet if there's one
   QFile cssFile( Config::getUserQtCssFileName() );

diff --git a/qt-style-macos.css b/qt-style-macos.css
@@ -1,32 +0,0 @@
-#navToolbar #translateLine
-{
-  margin-top: 1px;
-}
-
-#navToolbar GroupComboBox
-{
-  margin-bottom: 1px;
-  margin-top: 0px;
-  padding: 2px 18px 2px 4px;
-}
-
-#navToolbar GroupComboBox::drop-down {
-  padding-right: 2px;
-  border-right: 1px solid darkgray;
-}
-
-ScanPopup #translateLine
-{
-  padding: 3px 3px 3px 3px;
-}
-
-ScanPopup GroupComboBox
-{
-  margin: 2px 0px 4px 1px;
-  padding: 1px 18px 1px 4px;
-}
-
-ScanPopup GroupComboBox::drop-down {
-  padding-right: 2px;
-  border-right: 1px solid darkgray;
-}

diff --git a/qt-style-st-babylon.css b/qt-style-st-babylon.css
diff --git a/qt-style-st-classic.css b/qt-style-st-classic.css
diff --git a/qt-style-st-lingoes-blue.css b/qt-style-st-lingoes-blue.css
diff --git a/qt-style-st-lingoes.css b/qt-style-st-lingoes.css
diff --git a/qt-style-st-lingvo.css b/qt-style-st-lingvo.css
diff --git a/qt-style-st-modern.css b/qt-style-st-modern.css
diff --git a/qt-style-win.css b/qt-style-win.css
@@ -0,0 +1,6 @@
+QTabBar::close-button {
+    image: url(:/icons/closetab.svg)
+}
+QTabBar::close-button:hover {
+    image: url(:/icons/closetab-hover.png)
+}