New icon set. Fixed adding of our own entry to internal userlist.

master
Tomatix 4 years ago
parent ee13cb15dc
commit 6ab13d679a
  1. 2
      CMakeLists.txt
  2. 2
      IRCClient/IRCBase.cpp
  3. 4
      IdealIRC/IdealIRC.cpp
  4. 6
      IdealIRC/IdealIRC.ui
  5. BIN
      Resources/Icons/channel.kra
  6. BIN
      Resources/Icons/connect.png
  7. BIN
      Resources/Icons/disconnect.png
  8. BIN
      Resources/Icons/icon.png
  9. BIN
      Resources/Icons/iconcutted.png
  10. BIN
      Resources/Icons/log.png
  11. BIN
      Resources/Icons/options.png
  12. BIN
      Resources/Icons/script.png
  13. BIN
      Resources/Icons/server.kra
  14. BIN
      Resources/Icons/server.png
  15. 3
      Resources/resources.qrc

@ -8,7 +8,7 @@ project(IdealIRC)
set(BUILD_TYPE "packaged")
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
set(VERSION_PATCH 1)
set(VERSION_PATCH 2)
set(VERSION_APPEND "")
#

@ -1078,7 +1078,7 @@ void IRCBasePriv::parseIncoming(const std::string& line)
startKeepaliveTimer();
// Emplace ourself in the all-members list.
allMembers.emplace_back(std::make_shared<IRCMember>(sender));
allMembers.emplace_back(std::make_shared<IRCMember>( IRCPrefix::fromNickname(nickname) ));
super.onRegistered();
}

@ -55,7 +55,7 @@ IdealIRC::IdealIRC(QWidget* parent)
.arg(windowTitle())
.arg(VERSION_STRING_NO_APPEND);
setWindowTitle(title);
trayIcon = new QSystemTrayIcon(QIcon(QStringLiteral(":/Icons/iconcutted.png")), this);
trayIcon = new QSystemTrayIcon(QIcon(QStringLiteral(":/Icons/icon.png")), this);
mdiManager = new MdiManager(*ui->mdiArea, *ui->windowButtons, *trayIcon);
trayIcon->show();
trayIcon->setToolTip(title);
@ -208,9 +208,11 @@ void IdealIRC::setConnectButtonState(IdealIRC::ConnectButtonState state)
switch (state) {
case ConnectButtonState::Connect:
ui->actionConnect->setText(tr("Connect"));
ui->actionConnect->setIcon( QIcon(":/Icons/connect.png") );
break;
case ConnectButtonState::Disconnect:
ui->actionConnect->setText(tr("Disconnect"));
ui->actionConnect->setIcon( QIcon(":/Icons/disconnect.png") );
break;
}
ui->actionConnect->setData(static_cast<int>(state));

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/Icons/iconcutted.png</normaloff>:/Icons/iconcutted.png</iconset>
<normaloff>:/Icons/icon.png</normaloff>:/Icons/icon.png</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout">
@ -118,6 +118,10 @@
</attribute>
</widget>
<action name="actionConnect">
<property name="icon">
<iconset>
<normaloff>../Resources/Icons/connect.png</normaloff>../Resources/Icons/connect.png</iconset>
</property>
<property name="text">
<string>Connect</string>
</property>

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 80 KiB

@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>Icons/iconcutted.png</file>
<file>Icons/icon.png</file>
<file>Icons/log.png</file>
<file>Icons/options.png</file>
@ -13,5 +12,7 @@
<file>Icons/channel.png</file>
<file>Icons/private.png</file>
<file>Icons/serverwindow.png</file>
<file>Icons/connect.png</file>
<file>Icons/disconnect.png</file>
</qresource>
</RCC>

Loading…
Cancel
Save