icons: Use more common names for irc-channel-* icons

irc-channel-joined and irc-channel-parted are not shipped with Oxygen.
Use irc-channel-active and irc-channel-inactive instead, which are
supported by both Oxygen and Breeze (and are identical to the previous
ones in Breeze).

diff --git a/3rdparty/icons/breeze-dark/status/16/irc-channel-joined.svg b/3rdparty/icons/breeze-dark/actions/16/irc-channel-active.svg
similarity index 100%
rename from 3rdparty/icons/breeze-dark/status/16/irc-channel-joined.svg
rename to 3rdparty/icons/breeze-dark/actions/16/irc-channel-active.svg

diff --git a/3rdparty/icons/breeze-dark/status/16/irc-channel-parted.svg b/3rdparty/icons/breeze-dark/actions/16/irc-channel-inactive.svg
similarity index 100%
rename from 3rdparty/icons/breeze-dark/status/16/irc-channel-parted.svg
rename to 3rdparty/icons/breeze-dark/actions/16/irc-channel-inactive.svg

diff --git a/3rdparty/icons/breeze-dark/status/22/irc-channel-joined.svg b/3rdparty/icons/breeze-dark/actions/22/irc-channel-active.svg
similarity index 100%
rename from 3rdparty/icons/breeze-dark/status/22/irc-channel-joined.svg
rename to 3rdparty/icons/breeze-dark/actions/22/irc-channel-active.svg

diff --git a/3rdparty/icons/breeze-dark/status/22/irc-channel-parted.svg b/3rdparty/icons/breeze-dark/actions/22/irc-channel-inactive.svg
similarity index 100%
rename from 3rdparty/icons/breeze-dark/status/22/irc-channel-parted.svg
rename to 3rdparty/icons/breeze-dark/actions/22/irc-channel-inactive.svg

diff --git a/3rdparty/icons/breeze-dark/actions/24/irc-channel-active.svg b/3rdparty/icons/breeze-dark/actions/24/irc-channel-active.svg
new file mode 100644 (file)
index 0000000..0551e0a
--- /dev/null
+++ b/3rdparty/icons/breeze-dark/actions/24/irc-channel-active.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8 4 L 8 8 L 4 8 L 4 9 L 8 9 L 8 15 L 4 15 L 4 16 L 8 16 L 8 20 L 9 20 L 9 16 L 12 16 L 12 15 L 9 15 L 9 9 L 15 9 L 15 12 L 16 12 L 16 9 L 20 9 L 20 8 L 16 8 L 16 4 L 15 4 L 15 8 L 9 8 L 9 4 L 8 4 z "
+     class="ColorScheme-Text"
+     />
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText"
+     d="M 16.5 13 C 14.561 13 13 14.561 13 16.5 C 13 18.439 14.561 20 16.5 20 C 18.439 20 20 18.439 20 16.5 C 20 14.561 18.439 13 16.5 13 z "
+      />
+</svg>

diff --git a/3rdparty/icons/breeze-dark/actions/24/irc-channel-inactive.svg b/3rdparty/icons/breeze-dark/actions/24/irc-channel-inactive.svg
new file mode 100644 (file)
index 0000000..4d08999
--- /dev/null
+++ b/3rdparty/icons/breeze-dark/actions/24/irc-channel-inactive.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8 4 L 8 8 L 4 8 L 4 9 L 8 9 L 8 15 L 4 15 L 4 16 L 8 16 L 8 20 L 9 20 L 9 16 L 12 16 L 12 15 L 9 15 L 9 9 L 15 9 L 15 12 L 16 12 L 16 9 L 20 9 L 20 8 L 16 8 L 16 4 L 15 4 L 15 8 L 9 8 L 9 4 L 8 4 z "
+     class="ColorScheme-Text"
+     />
+ <path 
+     style="fill:currentColor;fill-opacity:0.5;stroke:none" 
+     d="M 16.5 13 C 14.561 13 13 14.561 13 16.5 C 13 18.439 14.561 20 16.5 20 C 18.439 20 20 18.439 20 16.5 C 20 14.561 18.439 13 16.5 13 z "
+     class="ColorScheme-Text"
+     />
+</svg>

diff --git a/3rdparty/icons/breeze/status/16/irc-channel-joined.svg b/3rdparty/icons/breeze/actions/16/irc-channel-active.svg
similarity index 100%
rename from 3rdparty/icons/breeze/status/16/irc-channel-joined.svg
rename to 3rdparty/icons/breeze/actions/16/irc-channel-active.svg

diff --git a/3rdparty/icons/breeze/status/16/irc-channel-parted.svg b/3rdparty/icons/breeze/actions/16/irc-channel-inactive.svg
similarity index 100%
rename from 3rdparty/icons/breeze/status/16/irc-channel-parted.svg
rename to 3rdparty/icons/breeze/actions/16/irc-channel-inactive.svg

diff --git a/3rdparty/icons/breeze/status/22/irc-channel-joined.svg b/3rdparty/icons/breeze/actions/22/irc-channel-active.svg
similarity index 100%
rename from 3rdparty/icons/breeze/status/22/irc-channel-joined.svg
rename to 3rdparty/icons/breeze/actions/22/irc-channel-active.svg

diff --git a/3rdparty/icons/breeze/status/22/irc-channel-parted.svg b/3rdparty/icons/breeze/actions/22/irc-channel-inactive.svg
similarity index 100%
rename from 3rdparty/icons/breeze/status/22/irc-channel-parted.svg
rename to 3rdparty/icons/breeze/actions/22/irc-channel-inactive.svg

diff --git a/3rdparty/icons/breeze/actions/24/irc-channel-active.svg b/3rdparty/icons/breeze/actions/24/irc-channel-active.svg
new file mode 100644 (file)
index 0000000..ee0c47c
--- /dev/null
+++ b/3rdparty/icons/breeze/actions/24/irc-channel-active.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8 4 L 8 8 L 4 8 L 4 9 L 8 9 L 8 15 L 4 15 L 4 16 L 8 16 L 8 20 L 9 20 L 9 16 L 12 16 L 12 15 L 9 15 L 9 9 L 15 9 L 15 12 L 16 12 L 16 9 L 20 9 L 20 8 L 16 8 L 16 4 L 15 4 L 15 8 L 9 8 L 9 4 L 8 4 z "
+     class="ColorScheme-Text"
+     />
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText"
+     d="M 16.5 13 C 14.561 13 13 14.561 13 16.5 C 13 18.439 14.561 20 16.5 20 C 18.439 20 20 18.439 20 16.5 C 20 14.561 18.439 13 16.5 13 z "
+      />
+</svg>

diff --git a/3rdparty/icons/breeze/actions/24/irc-channel-inactive.svg b/3rdparty/icons/breeze/actions/24/irc-channel-inactive.svg
new file mode 100644 (file)
index 0000000..1e821e0
--- /dev/null
+++ b/3rdparty/icons/breeze/actions/24/irc-channel-inactive.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 8 4 L 8 8 L 4 8 L 4 9 L 8 9 L 8 15 L 4 15 L 4 16 L 8 16 L 8 20 L 9 20 L 9 16 L 12 16 L 12 15 L 9 15 L 9 9 L 15 9 L 15 12 L 16 12 L 16 9 L 20 9 L 20 8 L 16 8 L 16 4 L 15 4 L 15 8 L 9 8 L 9 4 L 8 4 z "
+     class="ColorScheme-Text"
+     />
+ <path 
+     style="fill:currentColor;fill-opacity:0.5;stroke:none" 
+     d="M 16.5 13 C 14.561 13 13 14.561 13 16.5 C 13 18.439 14.561 20 16.5 20 C 18.439 20 20 18.439 20 16.5 C 20 14.561 18.439 13 16.5 13 z "
+     class="ColorScheme-Text"
+     />
+</svg>

diff --git a/3rdparty/icons/breeze_dark_icon_theme.qrc b/3rdparty/icons/breeze_dark_icon_theme.qrc
index 0e77c95..f20e7e2 100644 (file)
--- a/3rdparty/icons/breeze_dark_icon_theme.qrc
+++ b/3rdparty/icons/breeze_dark_icon_theme.qrc
@@ -35,6 +35,8 @@
     <file>breeze-dark/actions/16/im-user-away.svg</file>
     <file>breeze-dark/actions/16/im-user-offline.svg</file>
     <file>breeze-dark/actions/16/im-user.svg</file>
     <file>breeze-dark/actions/16/im-user-away.svg</file>
     <file>breeze-dark/actions/16/im-user-offline.svg</file>
     <file>breeze-dark/actions/16/im-user.svg</file>

+    <file>breeze-dark/actions/16/irc-channel-active.svg</file>
+    <file>breeze-dark/actions/16/irc-channel-inactive.svg</file>

     <file>breeze-dark/actions/16/irc-close-channel.svg</file>
     <file>breeze-dark/actions/16/irc-join-channel.svg</file>
     <file>breeze-dark/actions/16/list-add-user.svg</file>
     <file>breeze-dark/actions/16/irc-close-channel.svg</file>
     <file>breeze-dark/actions/16/irc-join-channel.svg</file>
     <file>breeze-dark/actions/16/list-add-user.svg</file>


@@ -86,6 +88,8 @@
     <file>breeze-dark/actions/22/im-user-away.svg</file>
     <file>breeze-dark/actions/22/im-user-offline.svg</file>
     <file>breeze-dark/actions/22/im-user.svg</file>
     <file>breeze-dark/actions/22/im-user-away.svg</file>
     <file>breeze-dark/actions/22/im-user-offline.svg</file>
     <file>breeze-dark/actions/22/im-user.svg</file>

+    <file>breeze-dark/actions/22/irc-channel-active.svg</file>
+    <file>breeze-dark/actions/22/irc-channel-inactive.svg</file>

     <file>breeze-dark/actions/22/irc-close-channel.svg</file>
     <file>breeze-dark/actions/22/irc-join-channel.svg</file>
     <file>breeze-dark/actions/22/irc-operator.svg</file>
     <file>breeze-dark/actions/22/irc-close-channel.svg</file>
     <file>breeze-dark/actions/22/irc-join-channel.svg</file>
     <file>breeze-dark/actions/22/irc-operator.svg</file>


@@ -141,6 +145,8 @@
     <file>breeze-dark/actions/24/im-user-away.svg</file>
     <file>breeze-dark/actions/24/im-user-offline.svg</file>
     <file>breeze-dark/actions/24/im-user.svg</file>
     <file>breeze-dark/actions/24/im-user-away.svg</file>
     <file>breeze-dark/actions/24/im-user-offline.svg</file>
     <file>breeze-dark/actions/24/im-user.svg</file>

+    <file>breeze-dark/actions/24/irc-channel-active.svg</file>
+    <file>breeze-dark/actions/24/irc-channel-inactive.svg</file>

     <file>breeze-dark/actions/24/irc-close-channel.svg</file>
     <file>breeze-dark/actions/24/irc-join-channel.svg</file>
     <file>breeze-dark/actions/24/irc-operator.svg</file>
     <file>breeze-dark/actions/24/irc-close-channel.svg</file>
     <file>breeze-dark/actions/24/irc-join-channel.svg</file>
     <file>breeze-dark/actions/24/irc-operator.svg</file>


@@ -184,15 +190,11 @@
     <file>breeze-dark/index.theme</file>
     <file>breeze-dark/preferences/32/help-about.svg</file>
     <file>breeze-dark/status/16/dialog-information.svg</file>
     <file>breeze-dark/index.theme</file>
     <file>breeze-dark/preferences/32/help-about.svg</file>
     <file>breeze-dark/status/16/dialog-information.svg</file>

-    <file>breeze-dark/status/16/irc-channel-joined.svg</file>
-    <file>breeze-dark/status/16/irc-channel-parted.svg</file>

     <file>breeze-dark/status/16/security-high.svg</file>
     <file>breeze-dark/status/16/security-low.svg</file>
     <file>breeze-dark/status/16/user-away.svg</file>
     <file>breeze-dark/status/22/dialog-information.svg</file>
     <file>breeze-dark/status/22/dialog-password.svg</file>
     <file>breeze-dark/status/16/security-high.svg</file>
     <file>breeze-dark/status/16/security-low.svg</file>
     <file>breeze-dark/status/16/user-away.svg</file>
     <file>breeze-dark/status/22/dialog-information.svg</file>
     <file>breeze-dark/status/22/dialog-password.svg</file>

-    <file>breeze-dark/status/22/irc-channel-joined.svg</file>
-    <file>breeze-dark/status/22/irc-channel-parted.svg</file>

     <file>breeze-dark/status/22/network-wired.svg</file>
     <file>breeze-dark/status/22/security-high.svg</file>
     <file>breeze-dark/status/22/security-low.svg</file>
     <file>breeze-dark/status/22/network-wired.svg</file>
     <file>breeze-dark/status/22/security-high.svg</file>
     <file>breeze-dark/status/22/security-low.svg</file>

diff --git a/3rdparty/icons/breeze_icon_theme.qrc b/3rdparty/icons/breeze_icon_theme.qrc
index 1dbbe5a..22dcf72 100644 (file)
--- a/3rdparty/icons/breeze_icon_theme.qrc
+++ b/3rdparty/icons/breeze_icon_theme.qrc
@@ -35,6 +35,8 @@
     <file>breeze/actions/16/im-user-away.svg</file>
     <file>breeze/actions/16/im-user-offline.svg</file>
     <file>breeze/actions/16/im-user.svg</file>
     <file>breeze/actions/16/im-user-away.svg</file>
     <file>breeze/actions/16/im-user-offline.svg</file>
     <file>breeze/actions/16/im-user.svg</file>

+    <file>breeze/actions/16/irc-channel-active.svg</file>
+    <file>breeze/actions/16/irc-channel-inactive.svg</file>

     <file>breeze/actions/16/irc-close-channel.svg</file>
     <file>breeze/actions/16/irc-join-channel.svg</file>
     <file>breeze/actions/16/list-add-user.svg</file>
     <file>breeze/actions/16/irc-close-channel.svg</file>
     <file>breeze/actions/16/irc-join-channel.svg</file>
     <file>breeze/actions/16/list-add-user.svg</file>


@@ -86,6 +88,8 @@
     <file>breeze/actions/22/im-user-away.svg</file>
     <file>breeze/actions/22/im-user-offline.svg</file>
     <file>breeze/actions/22/im-user.svg</file>
     <file>breeze/actions/22/im-user-away.svg</file>
     <file>breeze/actions/22/im-user-offline.svg</file>
     <file>breeze/actions/22/im-user.svg</file>

+    <file>breeze/actions/22/irc-channel-active.svg</file>
+    <file>breeze/actions/22/irc-channel-inactive.svg</file>

     <file>breeze/actions/22/irc-close-channel.svg</file>
     <file>breeze/actions/22/irc-join-channel.svg</file>
     <file>breeze/actions/22/irc-operator.svg</file>
     <file>breeze/actions/22/irc-close-channel.svg</file>
     <file>breeze/actions/22/irc-join-channel.svg</file>
     <file>breeze/actions/22/irc-operator.svg</file>


@@ -141,6 +145,8 @@
     <file>breeze/actions/24/im-user-away.svg</file>
     <file>breeze/actions/24/im-user-offline.svg</file>
     <file>breeze/actions/24/im-user.svg</file>
     <file>breeze/actions/24/im-user-away.svg</file>
     <file>breeze/actions/24/im-user-offline.svg</file>
     <file>breeze/actions/24/im-user.svg</file>

+    <file>breeze/actions/24/irc-channel-active.svg</file>
+    <file>breeze/actions/24/irc-channel-inactive.svg</file>

     <file>breeze/actions/24/irc-close-channel.svg</file>
     <file>breeze/actions/24/irc-join-channel.svg</file>
     <file>breeze/actions/24/irc-operator.svg</file>
     <file>breeze/actions/24/irc-close-channel.svg</file>
     <file>breeze/actions/24/irc-join-channel.svg</file>
     <file>breeze/actions/24/irc-operator.svg</file>


@@ -184,15 +190,11 @@
     <file>breeze/index.theme</file>
     <file>breeze/preferences/32/help-about.svg</file>
     <file>breeze/status/16/dialog-information.svg</file>
     <file>breeze/index.theme</file>
     <file>breeze/preferences/32/help-about.svg</file>
     <file>breeze/status/16/dialog-information.svg</file>

-    <file>breeze/status/16/irc-channel-joined.svg</file>
-    <file>breeze/status/16/irc-channel-parted.svg</file>

     <file>breeze/status/16/security-high.svg</file>
     <file>breeze/status/16/security-low.svg</file>
     <file>breeze/status/16/user-away.svg</file>
     <file>breeze/status/22/dialog-information.svg</file>
     <file>breeze/status/22/dialog-password.svg</file>
     <file>breeze/status/16/security-high.svg</file>
     <file>breeze/status/16/security-low.svg</file>
     <file>breeze/status/16/user-away.svg</file>
     <file>breeze/status/22/dialog-information.svg</file>
     <file>breeze/status/22/dialog-password.svg</file>

-    <file>breeze/status/22/irc-channel-joined.svg</file>
-    <file>breeze/status/22/irc-channel-parted.svg</file>

     <file>breeze/status/22/network-wired.svg</file>
     <file>breeze/status/22/security-high.svg</file>
     <file>breeze/status/22/security-low.svg</file>
     <file>breeze/status/22/network-wired.svg</file>
     <file>breeze/status/22/security-high.svg</file>
     <file>breeze/status/22/security-low.svg</file>

diff --git a/icons/oxygen/16x16/status/irc-channel-joined.png b/icons/oxygen/16x16/status/irc-channel-active.png
similarity index 100%
rename from icons/oxygen/16x16/status/irc-channel-joined.png
rename to icons/oxygen/16x16/status/irc-channel-active.png

diff --git a/icons/oxygen/16x16/status/irc-channel-parted.png b/icons/oxygen/16x16/status/irc-channel-inactive.png
similarity index 100%
rename from icons/oxygen/16x16/status/irc-channel-parted.png
rename to icons/oxygen/16x16/status/irc-channel-inactive.png

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 3a0b823..d5345ec 100644 (file)
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -63,8 +63,8 @@ QColor extendedMircColor(int number)
 
 UiStyle::UiStyle(QObject *parent)
     : QObject(parent),
 
 UiStyle::UiStyle(QObject *parent)
     : QObject(parent),

-    _channelJoinedIcon(QIcon::fromTheme("irc-channel-joined", QIcon(":/icons/irc-channel-joined.png"))),
-    _channelPartedIcon(QIcon::fromTheme("irc-channel-parted", QIcon(":/icons/irc-channel-parted.png"))),
+    _channelJoinedIcon(QIcon::fromTheme("irc-channel-active", QIcon(":/icons/irc-channel-active.png"))),
+    _channelPartedIcon(QIcon::fromTheme("irc-channel-inactive", QIcon(":/icons/irc-channel-inactive.png"))),

     _userOfflineIcon(QIcon::fromTheme("im-user-offline", QIcon::fromTheme("user-offline", QIcon(":/icons/im-user-offline.png")))),
     _userOnlineIcon(QIcon::fromTheme("im-user", QIcon::fromTheme("user-available", QIcon(":/icons/im-user.png")))), // im-user-* are non-standard oxygen extensions
     _userAwayIcon(QIcon::fromTheme("im-user-away", QIcon::fromTheme("user-away", QIcon(":/icons/im-user-away.png")))),
     _userOfflineIcon(QIcon::fromTheme("im-user-offline", QIcon::fromTheme("user-offline", QIcon(":/icons/im-user-offline.png")))),
     _userOnlineIcon(QIcon::fromTheme("im-user", QIcon::fromTheme("user-available", QIcon(":/icons/im-user.png")))), // im-user-* are non-standard oxygen extensions
     _userAwayIcon(QIcon::fromTheme("im-user-away", QIcon::fromTheme("user-away", QIcon(":/icons/im-user-away.png")))),