[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3000 - in gnunet-qt/src: core include
From: |
durner |
Subject: |
[GNUnet-SVN] r3000 - in gnunet-qt/src: core include |
Date: |
Sat, 10 Jun 2006 04:10:19 -0700 (PDT) |
Author: durner
Date: 2006-06-10 04:10:14 -0700 (Sat, 10 Jun 2006)
New Revision: 3000
Modified:
gnunet-qt/src/core/wndMain.cc
gnunet-qt/src/core/wndMain.h
gnunet-qt/src/include/gnunet_qt_common.h
Log:
status bar with icons
Modified: gnunet-qt/src/core/wndMain.cc
===================================================================
--- gnunet-qt/src/core/wndMain.cc 2006-06-10 11:06:13 UTC (rev 2999)
+++ gnunet-qt/src/core/wndMain.cc 2006-06-10 11:10:14 UTC (rev 3000)
@@ -24,18 +24,47 @@
* @author Nils Durner
*/
+#include <QSizeGrip>
+
#include "wndMain.h"
GMainWindow::GMainWindow(QWidget *parent) : QMainWindow(parent)
{
+ QHBoxLayout *lay;
+
setupUi(this);
delete tabRoot;
- setStatusBar(new QStatusBar());
+
+ QStatusBar *bar = statusBar();
+ if (bar)
+ {
+ lay = new QHBoxLayout();
+
+ statusText.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+ bar->setSizeGripEnabled(false);
+
+ lay->addWidget(&statusIcon);
+ lay->addWidget(&statusText);
+ delete bar->layout();
+ bar->setLayout(lay);
+ }
}
void GMainWindow::addApplication(QWidget *wnd, const QIcon &icon, const
QString &label)
{
tabWidget->addTab(wnd, icon, label);
+ connect(wnd, SIGNAL(setStatusText(const QPixmap *, const QString &)),
+ this, SLOT(setStatusText(const QPixmap *, const QString &)));
}
+void GMainWindow::setStatusText(const QPixmap *icon, const QString &strText)
+{
+ if (icon)
+ statusIcon.setPixmap(*icon);
+
+ statusText.setText(strText);
+}
+
+
/* end of wndMain.cc */
Modified: gnunet-qt/src/core/wndMain.h
===================================================================
--- gnunet-qt/src/core/wndMain.h 2006-06-10 11:06:13 UTC (rev 2999)
+++ gnunet-qt/src/core/wndMain.h 2006-06-10 11:10:14 UTC (rev 3000)
@@ -29,6 +29,8 @@
#include <QWidget>
#include <QMainWindow>
+#include <QLabel>
+
#include "ui_wndMain.h"
class GMainWindow: public QMainWindow, protected Ui::WndMain
@@ -38,6 +40,12 @@
public:
GMainWindow(QWidget *parent = NULL);
void addApplication(QWidget *wnd, const QIcon &icon, const QString &label);
+
+public:
+ QLabel statusIcon, statusText;
+
+protected slots:
+ void setStatusText(const QPixmap *icon, const QString &strText);
};
#endif /*WNDMAIN_H_*/
Modified: gnunet-qt/src/include/gnunet_qt_common.h
===================================================================
--- gnunet-qt/src/include/gnunet_qt_common.h 2006-06-10 11:06:13 UTC (rev
2999)
+++ gnunet-qt/src/include/gnunet_qt_common.h 2006-06-10 11:10:14 UTC (rev
3000)
@@ -45,7 +45,7 @@
public:
signals:
- int setStatusBar(const QString &strStatus);
+ virtual int setStatusText(const QPixmap *icon, const QString &strStatus);
};
class GPluginLoader : public QObject
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3000 - in gnunet-qt/src: core include,
durner <=