Fixed reversed patches.

4 files changed, 57 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b967547c1ecd..be9c440cd1b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,8 +34,8 @@ pkgbase = qtcreator-fixed-themes
 	source = qtcreator-dark-and-flat-selection-fixes.patch
 	sha256sums = aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43
 	sha256sums = 6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6
-	sha256sums = 9daa35cd105b9b7cf1e3d07daa45aaff509265bf72209a15f4624854582ba186
-	sha256sums = f67ac674c54fc2a05d4a01c46adab8271fe5b0e40cb1cd1772e76810e295a038
+	sha256sums = a7b87219de0ee3e18754749a057535c04357acc2478dcb3fca6bc4b1ba8a8178
+	sha256sums = 472e5206799953178f6fb8054e667a43cf895acd6f101d0363ff84b2b7ea6b9e
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index f571b839eee1..caa262f44d89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -37,8 +37,8 @@ source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/
         qtcreator-dark-and-flat-selection-fixes.patch)
 sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
             '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
-            '9daa35cd105b9b7cf1e3d07daa45aaff509265bf72209a15f4624854582ba186'
-            'f67ac674c54fc2a05d4a01c46adab8271fe5b0e40cb1cd1772e76810e295a038')
+            'a7b87219de0ee3e18754749a057535c04357acc2478dcb3fca6bc4b1ba8a8178'
+            '472e5206799953178f6fb8054e667a43cf895acd6f101d0363ff84b2b7ea6b9e')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-dark-and-flat-selection-fixes.patch b/qtcreator-dark-and-flat-selection-fixes.patch
index 2b525228976a..0cf397b177c3 100644
--- a/qtcreator-dark-and-flat-selection-fixes.patch
+++ b/qtcreator-dark-and-flat-selection-fixes.patch
@@ -1,52 +1,52 @@
 diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
-index 57b0849170..5da67fa236 100644
+index 5da67fa236..57b0849170 100644
 --- a/share/qtcreator/themes/dark.creatortheme
 +++ b/share/qtcreator/themes/dark.creatortheme
 @@ -9,7 +9,7 @@ text=ffe7e7e7
  textDisabled=7fffffff
  textHighlighted=ffe7e7e7
  hoverBackground=18ffffff
--selectedBackground=aa1f75cc
-+selectedBackground=66000000
+-selectedBackground=66000000
++selectedBackground=aa1f75cc
  selectedBackgroundText=aa1f75cc
  normalBackground=ff333333
  alternateBackground=ff515151
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index 89c54e943f..9c713b4202 100644
+index 9c713b4202..89c54e943f 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
 @@ -13,7 +13,7 @@ toolBarItemDisabled=60a4a6a8
  fancyBarsNormalTextColor=ffd0d0d0
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
--selectedBackground=aa1f75cc
-+selectedBackground=66000000
+-selectedBackground=66000000
++selectedBackground=aa1f75cc
  selectedBackgroundText=aa1f75cc
  normalBackground=ff2E2F30
  alternateBackground=ff353637
 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
-index 27fbbb2866..5932ae86dc 100644
+index 5932ae86dc..27fbbb2866 100644
 --- a/share/qtcreator/themes/flat-light.creatortheme
 +++ b/share/qtcreator/themes/flat-light.creatortheme
 @@ -11,7 +11,7 @@ toolBarItemDisabled=38000000
  fancyBarsNormalTextColor=ff000000
  fancyBarsBoldTextColor=a0010508
  hoverBackground=1a000000
--selectedBackground=55000000
-+selectedBackground=a8ffffff
+-selectedBackground=a8ffffff
++selectedBackground=55000000
  normalBackground=ffffffff
  alternateBackground=ff515151
  stop_error=ffec7373
 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
-index 10a60c1aad..ab0189528f 100644
+index ab0189528f..10a60c1aad 100644
 --- a/share/qtcreator/themes/flat.creatortheme
 +++ b/share/qtcreator/themes/flat.creatortheme
 @@ -11,7 +11,7 @@ toolBarItemDisabled=60a4a6a8
  fancyBarsNormalTextColor=ffffffff
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
--selectedBackground=ff1f75cc
-+selectedBackground=66000000
+-selectedBackground=66000000
++selectedBackground=ff1f75cc
  normalBackground=ffffffff
  alternateBackground=ff515151
  error=ffdf4f4f
diff --git a/qtcreator-dark-theme-fixes.patch b/qtcreator-dark-theme-fixes.patch
index 2e8ea760d15f..6042615de97d 100644
--- a/qtcreator-dark-theme-fixes.patch
+++ b/qtcreator-dark-theme-fixes.patch
@@ -1,136 +1,136 @@
 diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
-index 5da67fa236..ef19fc9fa6 100644
+index ef19fc9fa6..5da67fa236 100644
 --- a/share/qtcreator/themes/dark.creatortheme
 +++ b/share/qtcreator/themes/dark.creatortheme
-@@ -7,10 +7,8 @@ DefaultTextEditorColorScheme=dark.xml
+@@ -7,8 +7,10 @@ DefaultTextEditorColorScheme=dark.xml
  shadowBackground=ff232323
  text=ffe7e7e7
  textDisabled=7fffffff
--textHighlighted=ffe7e7e7
++textHighlighted=ffe7e7e7
  hoverBackground=18ffffff
  selectedBackground=66000000
--selectedBackgroundText=aa1f75cc
++selectedBackgroundText=aa1f75cc
  normalBackground=ff333333
  alternateBackground=ff515151
  error=ffd84044
-@@ -120,7 +118,7 @@ SplitterColor=splitterColor
+@@ -118,7 +120,7 @@ SplitterColor=splitterColor
  TextColorDisabled=textDisabled
  TextColorError=ffff4040
  TextColorHighlight=ffff0000
--TextColorHighlightBackground=7a6f1c
-+TextColorHighlightBackground=555500
+-TextColorHighlightBackground=555500
++TextColorHighlightBackground=7a6f1c
  TextColorLink=textColorLink
  TextColorLinkVisited=textColorLinkVisited
  TextColorNormal=text
-@@ -145,7 +143,7 @@ OutputPanes_TestWarnTextColor=ffc8c800
+@@ -143,7 +145,7 @@ OutputPanes_TestWarnTextColor=ffc8c800
  OutputPanes_TestFatalTextColor=ffb42828
  OutputPanes_TestDebugTextColor=ff329696
  OutputPaneButtonFlashColor=error
--OutputPaneToggleButtonTextColorChecked=textHighlighted
-+OutputPaneToggleButtonTextColorChecked=text
+-OutputPaneToggleButtonTextColorChecked=text
++OutputPaneToggleButtonTextColorChecked=textHighlighted
  OutputPaneToggleButtonTextColorUnchecked=text
  
  Debugger_LogWindow_LogInput=ff00acac
-@@ -206,9 +204,9 @@ PaletteText=text
+@@ -204,9 +206,9 @@ PaletteText=text
  PaletteButtonText=text
  PaletteButtonTextDisabled=textDisabled
  PaletteToolTipBase=selectedBackground
--PaletteHighlight=selectedBackgroundText
-+PaletteHighlight=selectedBackground
+-PaletteHighlight=selectedBackground
++PaletteHighlight=selectedBackgroundText
  PaletteDark=shadowBackground
--PaletteHighlightedText=textHighlighted
-+PaletteHighlightedText=ffffffff
+-PaletteHighlightedText=ffffffff
++PaletteHighlightedText=textHighlighted
  PaletteToolTipText=text
  PaletteLink=textColorLink
  PaletteLinkVisited=textColorLinkVisited
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index 9c713b4202..0c01aa1707 100644
+index 0c01aa1707..9c713b4202 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
-@@ -7,14 +7,12 @@ DefaultTextEditorColorScheme=creator-dark.xml
+@@ -7,12 +7,14 @@ DefaultTextEditorColorScheme=creator-dark.xml
  shadowBackground=ff404244
  text=ffd0d0d0
  textDisabled=60a4a6a8
--textHighlighted=ffd0d0d0
++textHighlighted=ffd0d0d0
  toolBarItem=b6fbfdff
  toolBarItemDisabled=60a4a6a8
  fancyBarsNormalTextColor=ffd0d0d0
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
  selectedBackground=66000000
--selectedBackgroundText=aa1f75cc
++selectedBackgroundText=aa1f75cc
  normalBackground=ff2E2F30
  alternateBackground=ff353637
  error=ffdf4f4f
-@@ -124,7 +122,7 @@ SplitterColor=splitter
+@@ -122,7 +124,7 @@ SplitterColor=splitter
  TextColorDisabled=textDisabled
  TextColorError=ffff4040
  TextColorHighlight=ffff0000
--TextColorHighlightBackground=7a6f1c
-+TextColorHighlightBackground=8a7f2c
+-TextColorHighlightBackground=8a7f2c
++TextColorHighlightBackground=7a6f1c
  TextColorLink=textColorLink
  TextColorLinkVisited=textColorLinkVisited
  TextColorNormal=text
-@@ -149,7 +147,7 @@ OutputPanes_TestWarnTextColor=ffc8c800
+@@ -147,7 +149,7 @@ OutputPanes_TestWarnTextColor=ffc8c800
  OutputPanes_TestFatalTextColor=ffc82828
  OutputPanes_TestDebugTextColor=ff329696
  OutputPaneButtonFlashColor=error
--OutputPaneToggleButtonTextColorChecked=textHighlighted
-+OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
+-OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
++OutputPaneToggleButtonTextColorChecked=textHighlighted
  OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor
  
  Debugger_LogWindow_LogInput=ff00acac
-@@ -224,9 +222,9 @@ PaletteText=text
+@@ -222,9 +224,9 @@ PaletteText=text
  PaletteButtonText=text
  PaletteButtonTextDisabled=textDisabled
  PaletteToolTipBase=selectedBackground
--PaletteHighlight=selectedBackgroundText
-+PaletteHighlight=selectedBackground
+-PaletteHighlight=selectedBackground
++PaletteHighlight=selectedBackgroundText
  PaletteDark=shadowBackground
--PaletteHighlightedText=textHighlighted
-+PaletteHighlightedText=ffffffff
+-PaletteHighlightedText=ffffffff
++PaletteHighlightedText=textHighlighted
  PaletteToolTipText=text
  PaletteLink=textColorLink
  PaletteLinkVisited=textColorLinkVisited
 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
-index 5932ae86dc..29edca63fd 100644
+index 29edca63fd..5932ae86dc 100644
 --- a/share/qtcreator/themes/flat-light.creatortheme
 +++ b/share/qtcreator/themes/flat-light.creatortheme
 @@ -145,7 +145,7 @@ OutputPanes_TestWarnTextColor=ffd0bb00
  OutputPanes_TestFatalTextColor=ff640000
  OutputPanes_TestDebugTextColor=ff329696
  OutputPaneButtonFlashColor=ffff0000
--OutputPaneToggleButtonTextColorChecked=ffffffff
-+OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
+-OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
++OutputPaneToggleButtonTextColorChecked=ffffffff
  OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor
  
  Debugger_LogWindow_LogInput=ff00acac
 diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
-index 2421bd776a..7276685d20 100644
+index 7276685d20..2421bd776a 100644
 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp
 +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
-@@ -87,7 +87,6 @@ public:
+@@ -87,6 +87,7 @@ public:
      LocatorModel(QObject *parent = nullptr)
          : QAbstractListModel(parent)
          , mBackgroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorHighlightBackground))
--        , mForegroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal))
++        , mForegroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal))
      {}
  
      void clear();
-@@ -101,7 +100,6 @@ private:
+@@ -100,6 +101,7 @@ private:
      mutable QList<LocatorFilterEntry> mEntries;
      bool hasExtraInfo = false;
      QColor mBackgroundColor;
--    QColor mForegroundColor;
++    QColor mForegroundColor;
  };
  
  class CompletionDelegate : public HighlightingItemDelegate
-@@ -226,8 +224,6 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
+@@ -224,6 +226,8 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
      }
      case int(HighlightingItemRole::Background):
          return mBackgroundColor;
--    case int(HighlightingItemRole::Foreground):
--        return mForegroundColor;
++    case int(HighlightingItemRole::Foreground):
++        return mForegroundColor;
      }
  
      return QVariant();