aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/CMakeLists.txt2
-rw-r--r--src/kvilib/tal/kvi_tal_listbox.cpp266
-rw-r--r--src/kvilib/tal/kvi_tal_listbox.h167
-rw-r--r--src/modules/CMakeLists.txt8
-rw-r--r--src/modules/editor/scripteditor.cpp6
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp22
-rw-r--r--src/modules/trayicon/libkvitrayicon.h4
7 files changed, 23 insertions, 452 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 1c33f4418..91184211f 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -27,7 +27,6 @@ SET(kvilib_MOC_HDRS
tal/kvi_tal_groupbox.h
tal/kvi_tal_hbox.h
tal/kvi_tal_iconview.h
- tal/kvi_tal_listbox.h
tal/kvi_tal_listwidget.h
tal/kvi_tal_popupmenu.h
tal/kvi_tal_scrollview.h
@@ -126,7 +125,6 @@ SET(kvilib_SRCS
tal/kvi_tal_hbox.cpp
tal/kvi_tal_iconview.cpp
tal/kvi_tal_itemdelegates.cpp
- tal/kvi_tal_listbox.cpp
tal/kvi_tal_listwidget.cpp
tal/kvi_tal_mainwindow.cpp
tal/kvi_tal_menubar.cpp
diff --git a/src/kvilib/tal/kvi_tal_listbox.cpp b/src/kvilib/tal/kvi_tal_listbox.cpp
deleted file mode 100644
index d19e3b3ae..000000000
--- a/src/kvilib/tal/kvi_tal_listbox.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-//=============================================================================
-//
-// File : kvi_tal_listbox.cpp
-// Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-// This file is part of the KVirc irc client distribution
-// Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-// This program is FREE software. You can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
-//
-// This program is distributed in the HOPE that it will be USEFUL,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, write to the Free Software Foundation,
-// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_tal_listbox.h"
-
-#include <QPainter>
-#include <QStyle>
-#include <QApplication>
-
-KviTalListBox::KviTalListBox(QWidget * pParent,Qt::WFlags f)
-: Q3ListBox(pParent,0,f)
-{
- connect(this,SIGNAL(highlighted(Q3ListBoxItem *)),this,SLOT(redirect_highlighted(Q3ListBoxItem *)));
- connect(this,SIGNAL(selected(Q3ListBoxItem *)),this,SLOT(redirect_selected(Q3ListBoxItem *)));
- connect(this,SIGNAL(selectionChanged(Q3ListBoxItem *)),this,SLOT(redirect_selectionChanged(Q3ListBoxItem *)));
- connect(this,SIGNAL(currentChanged(Q3ListBoxItem *)),this,SLOT(redirect_currentChanged(Q3ListBoxItem *)));
- connect(this,SIGNAL(clicked(Q3ListBoxItem *)),this,SLOT(redirect_clicked(Q3ListBoxItem *)));
- connect(this,SIGNAL(clicked(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_clicked(Q3ListBoxItem *,const QPoint &)));
- connect(this,SIGNAL(pressed(Q3ListBoxItem *)),this,SLOT(redirect_pressed(Q3ListBoxItem *)));
- connect(this,SIGNAL(pressed(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_pressed(Q3ListBoxItem *,const QPoint &)));
- connect(this,SIGNAL(doubleClicked(Q3ListBoxItem *)),this,SLOT(redirect_doubleClicked(Q3ListBoxItem *)));
- connect(this,SIGNAL(returnPressed(Q3ListBoxItem *)),this,SLOT(redirect_returnPressed(Q3ListBoxItem *)));
- connect(this,SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonClicked(Q3ListBoxItem *, const QPoint &)));
- connect(this,SIGNAL(rightButtonPressed(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonPressed(Q3ListBoxItem *, const QPoint &)));
- connect(this,SIGNAL(mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)));
- connect(this,SIGNAL(mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)));
- connect(this,SIGNAL(contextMenuRequested(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_contextMenuRequested(Q3ListBoxItem *,const QPoint &)));
- connect(this,SIGNAL(onItem(Q3ListBoxItem *)),this,SLOT(redirect_onItem(Q3ListBoxItem *)));
-}
-
-void KviTalListBox::redirect_highlighted(Q3ListBoxItem *item)
-{
- emit highlighted((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_selected(Q3ListBoxItem *item)
-{
- emit selected((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_selectionChanged(Q3ListBoxItem * item)
-{
- emit selectionChanged((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_currentChanged(Q3ListBoxItem * item)
-{
- emit currentChanged((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_clicked(Q3ListBoxItem * item)
-{
- emit clicked((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_clicked(Q3ListBoxItem * item,const QPoint & pnt)
-{
- emit clicked((KviTalListBoxItem *)item,pnt);
-}
-
-void KviTalListBox::redirect_pressed(Q3ListBoxItem * item)
-{
- emit pressed((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_pressed(Q3ListBoxItem * item,const QPoint & pnt)
-{
- emit pressed((KviTalListBoxItem *)item,pnt);
-}
-
-void KviTalListBox::redirect_doubleClicked(Q3ListBoxItem * item)
-{
- emit doubleClicked((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_returnPressed(Q3ListBoxItem * item)
-{
- emit returnPressed((KviTalListBoxItem *)item);
-}
-
-void KviTalListBox::redirect_rightButtonClicked(Q3ListBoxItem * item, const QPoint &pnt)
-{
- emit rightButtonClicked((KviTalListBoxItem *)item,pnt);
-}
-
-void KviTalListBox::redirect_rightButtonPressed(Q3ListBoxItem * item, const QPoint &pnt)
-{
- emit rightButtonPressed((KviTalListBoxItem *)item,pnt);
-}
-
-void KviTalListBox::redirect_mouseButtonPressed(int button,Q3ListBoxItem * item,const QPoint & pos)
-{
- emit mouseButtonPressed(button,(KviTalListBoxItem *)item,pos);
-}
-
-void KviTalListBox::redirect_mouseButtonClicked(int button,Q3ListBoxItem * item,const QPoint & pos)
-{
- emit mouseButtonClicked(button,(KviTalListBoxItem *)item,pos);
-}
-
-void KviTalListBox::redirect_contextMenuRequested(Q3ListBoxItem * item,const QPoint & pos)
-{
- emit contextMenuRequested((KviTalListBoxItem *)item,pos);
-}
-
-void KviTalListBox::redirect_onItem(Q3ListBoxItem * i)
-{
- emit onItem((KviTalListBoxItem *)i);
-}
-
-KviTalListBoxText::KviTalListBoxText(KviTalListBox *listbox, const QString &text)
-:KviTalListBoxItem(listbox)
-{
- setText(text);
-}
-
-KviTalListBoxText::KviTalListBoxText(const QString &text)
-:KviTalListBoxItem()
-{
- setText(text);
-}
-
-KviTalListBoxText::KviTalListBoxText(KviTalListBox* listbox, const QString &text, KviTalListBoxItem *after)
-: KviTalListBoxItem(listbox, after)
-{
- setText(text);
-}
-
-KviTalListBoxText::~KviTalListBoxText()
-{
-}
-
-void KviTalListBoxText::paint(QPainter *painter)
-{
- int itemHeight = height(listBox());
- QFontMetrics fm = painter->fontMetrics();
- int yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
- painter->drawText(3, yPos, text());
-}
-
-int KviTalListBoxText::height(const KviTalListBox* lb) const
-{
- int h = lb ? lb->fontMetrics().lineSpacing() + 2 : 0;
- return qMax(h, QApplication::globalStrut().height());
-}
-
-int KviTalListBoxText::width(const KviTalListBox* lb) const
-{
- int w = lb ? lb->fontMetrics().width(text()) + 6 : 0;
- return qMax(w, QApplication::globalStrut().width());
-}
-
-int KviTalListBoxText::rtti() const
-{
- return RTTI;
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap)
-: KviTalListBoxItem(listbox)
-{
- pm = pixmap;
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap &pixmap)
-: KviTalListBoxItem()
-{
- pm = pixmap;
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap, KviTalListBoxItem *after)
-: KviTalListBoxItem(listbox, after)
-{
- pm = pixmap;
-}
-
-KviTalListBoxPixmap::~KviTalListBoxPixmap()
-{
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pix, const QString& text)
-: KviTalListBoxItem(listbox)
-{
- pm = pix;
- setText(text);
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap & pix, const QString& text)
-: KviTalListBoxItem()
-{
- pm = pix;
- setText(text);
-}
-
-KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, const QString& text,KviTalListBoxItem *after)
-: KviTalListBoxItem(listbox, after)
-{
- pm = pix;
- setText(text);
-}
-
-void KviTalListBoxPixmap::paint(QPainter *painter)
-{
- int itemHeight = height(listBox());
- int yPos;
-
- const QPixmap *pm = pixmap();
- if (pm && ! pm->isNull()) {
- yPos = (itemHeight - pm->height()) / 2;
- painter->drawPixmap(3, yPos, *pm);
- }
-
- if (!text().isEmpty()) {
- QFontMetrics fm = painter->fontMetrics();
- yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
- painter->drawText(pm->width() + 5, yPos, text());
- }
-}
-
-int KviTalListBoxPixmap::height(const KviTalListBox* lb) const
-{
- int h;
- if (text().isEmpty())
- h = pm.height();
- else
- h = qMax(pm.height(), lb->fontMetrics().lineSpacing() + 2);
- return qMax(h, QApplication::globalStrut().height());
-}
-
-int KviTalListBoxPixmap::width(const KviTalListBox* lb) const
-{
- if (text().isEmpty())
- return qMax(pm.width() + 6, QApplication::globalStrut().width());
- return qMax(pm.width() + lb->fontMetrics().width(text()) + 6,
- QApplication::globalStrut().width());
-}
-
-int KviTalListBoxPixmap::rtti() const
-{
- return RTTI;
-}
-
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
- #include "kvi_tal_listbox.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvilib/tal/kvi_tal_listbox.h b/src/kvilib/tal/kvi_tal_listbox.h
deleted file mode 100644
index 1ed5f057c..000000000
--- a/src/kvilib/tal/kvi_tal_listbox.h
+++ /dev/null
@@ -1,167 +0,0 @@
-#ifndef _KVI_TAL_LISTBOX_H_
-#define _KVI_TAL_LISTBOX_H_
-
-//=============================================================================
-//
-// File : kvi_tal_listbox.h
-// Creation date : Mon May 05 2008 11:25:08 by Alessandro Carbone
-//
-// This file is part of the KVirc irc client distribution
-// Copyright (C) 2008 Alessandro Carbone (elfonol at gmail dot com)
-//
-// This program is FREE software. You can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
-//
-// This program is distributed in the HOPE that it will be USEFUL,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, write to the Free Software Foundation,
-// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-//
-// This is the only reasonable CROSS-QT3-QT4-COMPATIBLE implementation
-// of QListBox I've been able to find.
-// Note that using macros for the items will NOT work since moc
-// doesn't expand them. Note also that KviTalListBoxText must
-// be fully reimplemented and not be inherited from QListBoxText
-// to build up a consistent item object hierarchy. To complete
-// the obscenity, we need TWO COMPLETE implementations: one for Qt3
-// and one for Qt4... bleah :D
-//
-// The code for KviTalListBoxText is adapted from qlistbox.h/cpp
-// present in qt 3.3.6 AND in qt 4.1.2.
-//
-
-#include "kvi_settings.h"
-
-#include <q3listbox.h>
-
-class KviTalListBoxItem;
-
-
-class KVILIB_API KviTalListBox : public Q3ListBox
-{
- Q_OBJECT
-public:
- KviTalListBox(QWidget * pParent,Qt::WFlags f = 0);
- virtual ~KviTalListBox() {};
-public:
- KviTalListBoxItem * firstItem() const { return (KviTalListBoxItem *)Q3ListBox::firstItem(); };
- KviTalListBoxItem * selectedItem() const { return (KviTalListBoxItem *)Q3ListBox::selectedItem(); };
- KviTalListBoxItem * item(int iIndex) const { return (KviTalListBoxItem *)Q3ListBox::item(iIndex); };
-signals:
- void highlighted(KviTalListBoxItem *);
- void selected(KviTalListBoxItem *);
- void selectionChanged(KviTalListBoxItem * item);
- void currentChanged(KviTalListBoxItem * item);
- void clicked(KviTalListBoxItem * item);
- void clicked(KviTalListBoxItem * item,const QPoint & pnt);
- void pressed(KviTalListBoxItem * item);
- void pressed(KviTalListBoxItem * item,const QPoint & pnt);
- void doubleClicked(KviTalListBoxItem * item);
- void returnPressed(KviTalListBoxItem * item);
- void rightButtonClicked(KviTalListBoxItem *, const QPoint &);
- void rightButtonPressed(KviTalListBoxItem *, const QPoint &);
- void mouseButtonPressed(int button,KviTalListBoxItem * item,const QPoint & pos);
- void mouseButtonClicked(int button,KviTalListBoxItem * item,const QPoint & pos);
- void contextMenuRequested(KviTalListBoxItem * item,const QPoint & pos);
- void onItem(KviTalListBoxItem * i);
-protected slots:
- void redirect_highlighted(Q3ListBoxItem *);
- void redirect_selected(Q3ListBoxItem *);
- void redirect_selectionChanged(Q3ListBoxItem * item);
- void redirect_currentChanged(Q3ListBoxItem * item);
- void redirect_clicked(Q3ListBoxItem * item);
- void redirect_clicked(Q3ListBoxItem * item,const QPoint & pnt);
- void redirect_pressed(Q3ListBoxItem * item);
- void redirect_pressed(Q3ListBoxItem * item,const QPoint & pnt);
- void redirect_doubleClicked(Q3ListBoxItem * item);
- void redirect_returnPressed(Q3ListBoxItem *);
- void redirect_rightButtonClicked(Q3ListBoxItem *, const QPoint &);
- void redirect_rightButtonPressed(Q3ListBoxItem *, const QPoint &);
- void redirect_mouseButtonPressed(int button,Q3ListBoxItem * item,const QPoint & pos);
- void redirect_mouseButtonClicked(int button,Q3ListBoxItem * item,const QPoint & pos);
- void redirect_contextMenuRequested(Q3ListBoxItem * item,const QPoint & pos);
- void redirect_onItem(Q3ListBoxItem * i);
-};
-
-class KVILIB_API KviTalListBoxItem : public Q3ListBoxItem
-{
-public:
- KviTalListBoxItem()
- : Q3ListBoxItem() {};
- KviTalListBoxItem(KviTalListBox * pParent)
- : Q3ListBoxItem(pParent) {};
- KviTalListBoxItem(KviTalListBox * pParent,KviTalListBoxItem * pAfter)
- : Q3ListBoxItem(pParent,pAfter) {};
- virtual ~KviTalListBoxItem() {};
-public:
- KviTalListBoxItem * next() const { return (KviTalListBoxItem *)Q3ListBoxItem::next(); };
- KviTalListBoxItem * prev() const { return (KviTalListBoxItem *)Q3ListBoxItem::prev(); };
- KviTalListBox * listBox() const { return (KviTalListBox *)Q3ListBoxItem::listBox(); };
- virtual int height(const KviTalListBox *) const { return 0; };
- int height(const Q3ListBox *lb) const { return height((KviTalListBox *)lb); };
- virtual int width(const KviTalListBox *) const { return 0; };
- int width(const Q3ListBox *lb) const { return width((KviTalListBox *)lb); };
-};
-
-
-class KVILIB_API KviTalListBoxText : public KviTalListBoxItem
-{
-public:
- KviTalListBoxText(KviTalListBox* listbox, const QString & text=QString());
- KviTalListBoxText(const QString & text=QString());
- KviTalListBoxText(KviTalListBox* listbox, const QString & text, KviTalListBoxItem *after);
- ~KviTalListBoxText();
-
- int height(const KviTalListBox *) const;
- int width(const KviTalListBox *) const;
-
- int rtti() const;
- enum { RTTI = 1 };
-
-protected:
- virtual void paint(QPainter *);
-
-private:
- Q_DISABLE_COPY(KviTalListBoxText)
-};
-
-
-class KVILIB_API KviTalListBoxPixmap : public KviTalListBoxItem
-{
-public:
- KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &);
- KviTalListBoxPixmap(const QPixmap &);
- KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, KviTalListBoxItem *after);
- KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &, const QString&);
- KviTalListBoxPixmap(const QPixmap &, const QString&);
- KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, const QString&, KviTalListBoxItem *after);
- ~KviTalListBoxPixmap();
-
- const QPixmap *pixmap() const { return &pm; }
-
- int height(const KviTalListBox *) const;
- int width(const KviTalListBox *) const;
-
- int rtti() const;
- enum { RTTI = 2 };
-
-protected:
- virtual void paint(QPainter *);
-
-private:
- Q_DISABLE_COPY(KviTalListBoxPixmap)
- QPixmap pm;
-};
-
-#endif // _KVI_TAL_LISTBOX_H_
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index b6f617e87..2e59d9cc6 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -35,8 +35,12 @@ SUBDIRS(
raweditor regchan reguser
serverdb setup sharedfile sharedfileswindow
snd socketspy spaste str system
- texticons term theme tip tmphighlight toolbar toolbareditor trayicon
- upnp url
+ texticons term
+# theme <- to port
+ tip tmphighlight toolbar toolbareditor
+# trayicon <- to port
+ upnp
+ url
window
# broken modules
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 7bfd22b32..367e83719 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -38,13 +38,13 @@
#include "kvi_console.h"
#include "kvi_window.h"
#include "kvi_iconmanager.h"
-#include <kvi_tal_groupbox.h>
+#include "kvi_tal_groupbox.h"
#include "kvi_tal_scrollview.h"
#include "kvi_kvs_kernel.h"
#include "kvi_modulemanager.h"
#include "kvi_config.h"
-
#include "kvi_tal_vbox.h"
+
#include "kvi_tal_hbox.h"
#include <QScrollBar>
#include <QLayout>
@@ -225,7 +225,7 @@ void KviScriptEditorWidget::loadCompleterFromFile()
f.open(QIODevice::ReadOnly);
szBuffer=f.readAll();
f.close();
- szListFunctionsCommand=QStringList::split(',',szBuffer);
+ szListFunctionsCommand=szBuffer.split(',');
createCompleter(szListFunctionsCommand);
}
void KviScriptEditorWidget::createCompleter(QStringList &list)
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 44ecce764..7f5696e2b 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -78,7 +78,8 @@ KviTrayIcon::KviTrayIcon(KviFrame * frm)
m_iQueries = 0;
m_iOther = 0;
- m_pFlashingTimer = new QTimer(this,"flashing_timer");
+ m_pFlashingTimer = new QTimer(this);
+ m_pFlashingTimer->setObjectName("flashing_timer");
connect( m_pFlashingTimer, SIGNAL(timeout()), this, SLOT(flashingTimerShot()) );
m_bFlashed=0;
g_pTrayIconList->append(this);
@@ -93,8 +94,9 @@ KviTrayIcon::KviTrayIcon(KviFrame * frm)
l->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name());
m_pContextPopup->insertItem(l);
m_pContextPopup->setWindowTitle(__tr2qs("Context"));
- m_iAwayMenuId = m_pContextPopup->insertItem ( __tr2qs("Away"), m_pAwayPopup);
- m_pContextPopup->changeItem(m_iAwayMenuId,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),__tr2qs("Away"));
+ m_iAwayMenuId = m_pContextPopup->addMenu(m_pAwayPopup);
+ m_iAwayMenuId.setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)));
+ m_iAwayMenuId.setText(__tr2qs("Away"));
int id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),m_pFrm,SLOT(executeInternalCommand(int)));
m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_OPTIONS_DIALOG);
@@ -251,7 +253,7 @@ void KviTrayIcon::fillContextPopup()
m_pContextPopup->changeItem(m_iToggleFrame,m_pFrm->isVisible() ? __tr2qs("Hide Window") : __tr2qs("Show Window"));
if(g_pApp->topmostConnectedConsole())
{
- m_pContextPopup->setItemVisible(m_iAwayMenuId,true);
+ m_iAwayMenuId->setVisible(true);
m_pAwayPopup->clear();
int iAllAway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,SLOT(doAway(int)));
@@ -304,19 +306,19 @@ void KviTrayIcon::fillContextPopup()
void KviTrayIcon::toggleParentFrame()
{
- QWidget *top_widget = m_pFrm->topLevelWidget();
+ KviWindow *top_widget = m_pFrm->topLevelWidget();
if(m_pFrm->isVisible()) {
m_pFrm->hide();
} else {
- top_widget->show();
- top_widget->raise();
- top_widget->setActiveWindow();
- if(g_pActiveWindow) g_pActiveWindow->setFocus();
+/* top_widget->show();
+ top_widget->raise();*/
+ g_pFrame->setActiveWindow(top_widget);
+/* if(g_pActiveWindow) g_pActiveWindow->setFocus();
if(m_pFrm->isMinimized())
m_pFrm->showNormal();
else
- m_pFrm->show();
+ m_pFrm->show();*/
// m_pFrm->setWindowState(getPrevWindowState() & Qt::WindowMinimized);
}
}
diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
index b75eb632c..04ee1b822 100644
--- a/src/modules/trayicon/libkvitrayicon.h
+++ b/src/modules/trayicon/libkvitrayicon.h
@@ -50,10 +50,10 @@ protected:
KviTalPopupMenu * m_pAwayPopup;
int m_iToggleFrame;
- int m_iAwayMenuId;
+ QAction* m_pAwayMenuId;
bool m_bFlashed;
-
+
QPixmap m_CurrentPixmap;
QTimer* m_pFlashingTimer;
int m_iConsoles;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 11:53:49 +0000