From 3b7320ef4e2bd9f24b6dce72a8e8bf94c3695796 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Wed, 2 Mar 2011 02:08:42 +0100 Subject: Win32 clean out --- src/gui/clientConfigDialog.cpp | 16 ---------------- src/gui/ui/clientConfigDialog.ui | 30 +++--------------------------- 2 files changed, 3 insertions(+), 43 deletions(-) (limited to 'src/gui') diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp index b7ba407..0ddada0 100644 --- a/src/gui/clientConfigDialog.cpp +++ b/src/gui/clientConfigDialog.cpp @@ -96,16 +96,6 @@ void ClientConfigDialog::readSettings() else radioButtonOtherNO->setChecked(true); } - - reply = _ifaceDBus->getConfigValue("Permissions/allow_chat"); - reply.waitForFinished(); - if (reply.isValid()) - checkBoxAllowChat->setChecked(reply.value() == "T"); - - reply = _ifaceDBus->getConfigValue("Permissions/allow_filetransfer"); - reply.waitForFinished(); - if (reply.isValid()) - checkBoxAllowFiletransfer->setChecked(reply.value() == "T"); } void ClientConfigDialog::writeSettings() @@ -125,12 +115,6 @@ void ClientConfigDialog::writeSettings() else _ifaceDBus->setConfigValue("Permissions/vnc_other", "no"); - _ifaceDBus->setConfigValue("Permissions/allow_chat", - QString(checkBoxAllowChat->isChecked() ? "T" : "F")); - _ifaceDBus->setConfigValue("Permissions/allow_filetransfer", - QString(checkBoxAllowFiletransfer->isChecked() ? "T" : "F")); - _ifaceDBus->setConfigValue("multicast/interface", interfaceList->currentText()); - _settings.sync(); emit configChanged(); } diff --git a/src/gui/ui/clientConfigDialog.ui b/src/gui/ui/clientConfigDialog.ui index bb4bdc9..aa73433 100644 --- a/src/gui/ui/clientConfigDialog.ui +++ b/src/gui/ui/clientConfigDialog.ui @@ -6,8 +6,8 @@ 0 0 - 445 - 266 + 366 + 195 @@ -27,7 +27,7 @@ QTabWidget::North - 2 + 0 @@ -130,30 +130,6 @@ - - - - - - Accept chat messages - - - true - - - - - - - Accept file transfers - - - true - - - - - -- cgit v1.2.3-55-g7522 From c80ddd2600d49c0f5b729871abd914aadb575521 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Mon, 7 Mar 2011 21:55:05 +0100 Subject: [PVSMGRTOUCH] Add info dialog (name and passwd) --- src/gui/mainWindow.cpp | 20 +++++++++++--------- src/gui/mainWindow.h | 3 ++- src/gui/ui/mainwindowtouch.ui | 6 ++++++ 3 files changed, 19 insertions(+), 10 deletions(-) (limited to 'src/gui') diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index 6bb84a4..7cd0b02 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -47,8 +47,6 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : { ui->setupUi(this); - _info = new QLabel(""); - if (!QFile::exists(_settings.fileName())) { QDir::root().mkpath(QFileInfo(_settings.fileName()).path()); @@ -131,6 +129,7 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : qualityActionGroup->addAction(ui->action_quality_Low); // define the slots we want to use + connect(ui->action_Info, SIGNAL(triggered()), this, SLOT(info())); connect(ui->action_Quit, SIGNAL(triggered()), this, SLOT(close())); connect(ui->action_Manage_Profiles, SIGNAL(triggered()), this, SLOT(createProfile())); connect(ui->action_Reset, SIGNAL(triggered()), this, SLOT(resetall())); @@ -200,8 +199,6 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) : connect(ui->action_quality_Low, SIGNAL(triggered()), qualitySignalMapper, SLOT (map())); connect(qualitySignalMapper, SIGNAL(mapped(int)), this, SLOT(setVNCQuality(int))); - ui->toolBar->addWidget(_info); - #else // toolbar and actions in pvsmgr connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close())); @@ -361,7 +358,7 @@ void MainWindow::loadSettings() title.append(" [" + _sessionName + " : "); title.append(_pwdCon + "]"); setWindowTitle(title); - _info->setText(title); + _info = title; } else { @@ -370,7 +367,7 @@ void MainWindow::loadSettings() title.append(" [" + _sessionName + " : "); title.append(_pwdCon + "]"); setWindowTitle(title); - _info->setText(title); + _info = title; settings.beginGroup(current); QStringList keys = settings.childKeys(); for (int i = 0; i < keys.size(); i++) @@ -446,7 +443,7 @@ void MainWindow::loadSettings(QString profilname) // loads the current profile title.append(" [" + _sessionName + " : "); title.append(_pwdCon + "]"); setWindowTitle(title); - _info->setText(title); + _info = title; } } @@ -1122,7 +1119,7 @@ void MainWindow::setPasswordForConnection(int enabled) title.append(_profilName); title.append(" [" + _sessionName + " : ]"); setWindowTitle(title); - _info->setText(title); + _info = title; } else if (enabled == 2) //password is needed, we show it in the titlebar { @@ -1133,7 +1130,7 @@ void MainWindow::setPasswordForConnection(int enabled) title.append(" [" + _sessionName + " : "); title.append(_pwdCon + "]"); setWindowTitle(title); - _info->setText(title); + _info = title; } } //#endif @@ -1318,6 +1315,11 @@ int MainWindow::getDisplayedClientNameEnum() return displayedClientNameEnum; } +void MainWindow::info() +{ + QMessageBox::information(this, tr("Information"), _info); +} + MainWindow* MainWindow::myself = NULL; ConnectionList* MainWindow::conList = NULL; ConnectionWindow* MainWindow::conWin = NULL; diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index bbe9c49..cf618f0 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -123,7 +123,7 @@ private: QString _pwdCon; QString _sessionName; QString _profilName; - QLabel *_info; + QString _info; int displayedClientNameEnum; //to tell if username, loginname or ip is shown in clientList @@ -182,6 +182,7 @@ public slots: void unCloseUp(ConnectionFrame* connFrame); void closeUp(); void foto(); + void info(); void backgroundpicture(); void repaintbackgroundpicture(); void setdozenttoolbar(); diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui index 7241895..651217e 100644 --- a/src/gui/ui/mainwindowtouch.ui +++ b/src/gui/ui/mainwindowtouch.ui @@ -116,6 +116,7 @@ &File + @@ -491,6 +492,11 @@ Use Password + + + &Info + + -- cgit v1.2.3-55-g7522 From 4e5346da040e340db552b7661cc280c4cbf6ee0d Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Mon, 7 Mar 2011 23:37:42 +0100 Subject: [PVSMGRTOUCH] * QSplitter removed * SizePolicy set to MinimumExpanding --- src/gui/connectionFrame.cpp | 77 +++++++++++++++------------------------------ src/gui/connectionFrame.h | 7 ++--- 2 files changed, 27 insertions(+), 57 deletions(-) (limited to 'src/gui') diff --git a/src/gui/connectionFrame.cpp b/src/gui/connectionFrame.cpp index b618668..4211a50 100644 --- a/src/gui/connectionFrame.cpp +++ b/src/gui/connectionFrame.cpp @@ -28,58 +28,31 @@ extern "C" ConnectionFrame::ConnectionFrame(QWidget *parent) : QGroupBox(parent) { - //defines the ui-stuff - - _gL = new QGridLayout(this); - _gL->setSpacing(6); - _gL->setMargin(1); - - _split = new QSplitter(this); - _split->setOrientation(Qt::Vertical); - - _frame = new Frame("", _split); - _frame->setConFrame(this); - _split->addWidget(_frame); - - _conFrameTaskbar = new QWidget(_split); - _conFrameTaskbar->setMaximumHeight(30); - - _gLayout = new QGridLayout(_conFrameTaskbar); - _gLayout->setMargin(0); - _gLayout->setSpacing(0); - - _hLayoutInCfTaskbar = new QHBoxLayout(); - - _ip = new QLabel(_conFrameTaskbar); - _ip->setAlignment(Qt::AlignCenter); - - _hLayoutInCfTaskbar->addWidget(_ip); - - _dozentContaimner = new QLabel(_conFrameTaskbar); - _dozentContaimner->setAlignment(Qt::AlignRight); - _dozentContaimner->setMaximumSize(QSize(20, 20)); - _dozentContaimner->setScaledContents(true); - - _hLayoutInCfTaskbar->addWidget(_dozentContaimner); - - _dozentContaimner->setDisabled(true); - - _status = new QLabel(_conFrameTaskbar); - _status->setAlignment(Qt::AlignRight); - _status->setMaximumSize(QSize(22, 21)); - - _hLayoutInCfTaskbar->addWidget(_status); - - _gLayout->addLayout(_hLayoutInCfTaskbar, 0, 0, 1, 1); - _split->addWidget(_conFrameTaskbar); - - _gL->addWidget(_split, 0, 0, 1, 1); - - this->setLayout(_gL); + _layoutTop = new QVBoxLayout(this); + _layoutTop->setMargin(0); + _frame = new Frame("", this); + _frame->setConFrame(this); + _frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + _layoutTop->addWidget(_frame); + _layoutBottom = new QHBoxLayout(this); + _layoutBottom->setMargin(0); + _conFrameTaskbar = new QWidget(this); + _conFrameTaskbar->setLayout(_layoutBottom); + _conFrameTaskbar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); + _ip = new QLabel(_conFrameTaskbar); + _layoutBottom->addStretch(); + _layoutBottom->addWidget(_ip); + _layoutBottom->addStretch(); + _dozentContaimner = new QLabel(_conFrameTaskbar); + _dozentContaimner->setDisabled(true); + _layoutBottom->addWidget(_dozentContaimner); + _status = new QLabel(_conFrameTaskbar); + _layoutBottom->addWidget(_status); + _layoutTop->addWidget(_conFrameTaskbar); + this->setLayout(_layoutTop); setInitSize(190,168); - initFrame(); nat_height = 0; @@ -176,7 +149,7 @@ void ConnectionFrame::setInitSize(int w, int h) { resize(w, h); _frame->resize(w, h); - _conFrameTaskbar->resize(w, h); + //_conFrameTaskbar->resize(w, h); prev_height = h; prev_width = w; init_w = w; @@ -492,8 +465,8 @@ void ConnectionFrame::resizeComponent(int w, int h) { int th = (h*_conFrameTaskbar->width())/w; int uh = (h*_ip->width())/w; - _conFrameTaskbar->setMaximumSize(w, th); - _conFrameTaskbar->resize(w, th); + //_conFrameTaskbar->setMaximumSize(w, th); + //_conFrameTaskbar->resize(w, th); _ip->setMaximumSize(w, uh); _ip->resize(w,uh); } diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h index 235d0fc..6578793 100644 --- a/src/gui/connectionFrame.h +++ b/src/gui/connectionFrame.h @@ -154,15 +154,12 @@ protected: private: Frame *_frame; - //clickableLabel *frame; - QSplitter *_split; - QGridLayout* _gL; + QVBoxLayout *_layoutTop; + QHBoxLayout *_layoutBottom; QLabel* _ip; QLabel* _status; QLabel* _dozentContaimner; QWidget* _conFrameTaskbar; - QGridLayout* _gLayout; - QHBoxLayout* _hLayoutInCfTaskbar; PVSClient* _myConnection; QPixmap _clientPix; -- cgit v1.2.3-55-g7522 From 7d3a333d144033f80a7c5ecdd43996b691945436 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Tue, 8 Mar 2011 00:34:52 +0100 Subject: [PVSMGRTOUCH] * CloseUp fixed * Buttons removed --- src/gui/frame.cpp | 25 +++++++++++++------------ src/gui/mainWindow.cpp | 10 ++-------- 2 files changed, 15 insertions(+), 20 deletions(-) (limited to 'src/gui') diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp index aa6b0cb..960c502 100644 --- a/src/gui/frame.cpp +++ b/src/gui/frame.cpp @@ -51,12 +51,13 @@ Frame::Frame(const QString & text, QWidget * parent) : //QIcon icon; //icon.addFile(QString::fromUtf8(), QSize(), QIcon::Normal, QIcon::Off); - button_closeUp = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp())); - button_closeUp->setCheckable(true); - button_foto = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto())); - button_lock = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock())); +// button_closeUp = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp())); +// button_closeUp->setCheckable(true); +// button_foto = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto())); +// button_lock = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock())); //button_unlock = createToolButton(tr("Unlock this client"), QIcon(":/lock"),SLOT(setLock())); - button_dozent = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent())); +// button_dozent = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent())); +// button_dozent->setCheckable(true); button_control = createToolButton(tr("Enable Remote Control"), QIcon(":/remotecontrol"), SLOT(remoteControlClicked())); button_control->setCheckable(true); button_control_all = createToolButton(tr("Remote Control All Clients"), QIcon(":/remotecontrolall"), SLOT(remoteControlAllClicked())); @@ -311,8 +312,8 @@ void Frame::setToolButtonListVisible(bool visible) { foreach (QToolButton* tb, toolButtonList) tb->setVisible(visible); - if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent) - button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient). +// if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent) +// button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient). } @@ -320,12 +321,12 @@ void Frame::setLockStatus(bool lock) { if (lock) { - button_lock->setToolTip(tr("Unlock this client")); + //button_lock->setToolTip(tr("Unlock this client")); //button_lock->setIcon() TODO } else { - button_lock->setToolTip(tr("Lock this client")); + //button_lock->setToolTip(tr("Lock this client")); //button_lock->setIcon() TODO } _isLocked = lock; @@ -373,14 +374,14 @@ void Frame::setDozent() { if (_dozent) { - button_dozent->setToolTip(tr("Set client as Superclient")); + //button_dozent->setToolTip(tr("Set client as Superclient")); _dozent = false; MainWindow::getConnectionWindow()->hasDozent = false; getConFrame()->setDozent(false); } else { - button_dozent->setToolTip(tr("Unset client as Superclient")); + //button_dozent->setToolTip(tr("Unset client as Superclient")); _dozent = true; MainWindow::getConnectionWindow()->hasDozent = true; getConFrame()->setDozent(true); @@ -390,7 +391,7 @@ void Frame::setDozent() void Frame::setCloseUp(bool value) { _isCloseUp = value; - button_closeUp->setChecked(value); + //button_closeUp->setChecked(value); } void Frame::remoteControlClicked() diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index 7cd0b02..b4dd17c 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -800,16 +800,10 @@ void MainWindow::closeUp(ConnectionFrame* connFrame, PVSClient* pvsClient) // Do we already have a closeUp Frame? ConnectionFrame* closeupFrame = conWin->getCloseupFrame(); - if(closeupFrame) { - // Is it the same as the sender one? - if(connFrame == closeupFrame) - // Then it already is close up. - return; - else - // We need to un-closeUp the currently selected closeUp-Frame. - unCloseUp(closeupFrame); + unCloseUp(closeupFrame); + return; } _framePosOnCloseUp = connFrame->pos();//get the actualy position before run closeup -- cgit v1.2.3-55-g7522 From ef27d2efc13ba913501d8c44a6c307231834b0de Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Tue, 8 Mar 2011 17:31:20 +0100 Subject: [PVSMGRTOUCH] * Set thumbnail background color to light gray --- src/gui/connectionFrame.h | 4 ++-- src/gui/connectionWindow.cpp | 2 ++ src/gui/frame.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h index 6578793..84f8549 100644 --- a/src/gui/connectionFrame.h +++ b/src/gui/connectionFrame.h @@ -16,8 +16,8 @@ extern "C" } #define PROFILE -#define STYLE_DEFAULT "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" -#define STYLE_SELECTED "QGroupBox{background-color: rgb(150, 150, 150); margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" +#define STYLE_DEFAULT "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid black; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" +#define STYLE_SELECTED "QGroupBox{background-color: #DCDCDC; margin: 2px; border: 1px solid red; border-radius: 8px; padding: 2px; padding-top: 1.5em;}" #include diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp index df31562..ec6db1b 100644 --- a/src/gui/connectionWindow.cpp +++ b/src/gui/connectionWindow.cpp @@ -38,6 +38,8 @@ ConnectionWindow::ConnectionWindow(QWidget *parent) : menu->addAction(newDummy); setAcceptDrops(true); //drag&drop should be enabled + + setStyleSheet("background-color: #DCDCDC;"); } ConnectionWindow::~ConnectionWindow() { diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp index 960c502..7b3bf16 100644 --- a/src/gui/frame.cpp +++ b/src/gui/frame.cpp @@ -82,6 +82,7 @@ Frame::Frame(const QString & text, QWidget * parent) : _specialEventTimer->setSingleShot(true); connect(_specialEventTimer, SIGNAL(timeout()), this, SLOT(showSpecialEventMenu())); + setStyleSheet("background-color: #DCDCDC;border: 0px solid #DCDCDC;"); } Frame::~Frame() -- cgit v1.2.3-55-g7522 From bf700bb3f905942f41eadb80ee15e911dd8a9d90 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Tue, 8 Mar 2011 18:14:52 +0100 Subject: [pvsmgrtouch] * don't resize thumbnails on window resize --- src/gui/connectionFrame.cpp | 31 +++++-------------------------- src/gui/connectionFrame.h | 1 - src/gui/mainWindow.cpp | 39 --------------------------------------- 3 files changed, 5 insertions(+), 66 deletions(-) (limited to 'src/gui') diff --git a/src/gui/connectionFrame.cpp b/src/gui/connectionFrame.cpp index 4211a50..32e20f7 100644 --- a/src/gui/connectionFrame.cpp +++ b/src/gui/connectionFrame.cpp @@ -443,32 +443,11 @@ void ConnectionFrame::mouseMoveEvent(QMouseEvent *event) void ConnectionFrame::paintCloseUp(int w, int h) { - - - if (!_frame->image().isNull()) - { - /*this->setFixedWidth(w); - _conFrameTaskbar->setMaximumWidth(w); - resize(w, h);*/ - resizeComponent(w, h); - setMaximumSize(w,h); - resize(w, h); - } - else - { - std::cout << "pixel is NULL" << std::endl; - } - -} - -void ConnectionFrame::resizeComponent(int w, int h) -{ - int th = (h*_conFrameTaskbar->width())/w; - int uh = (h*_ip->width())/w; - //_conFrameTaskbar->setMaximumSize(w, th); - //_conFrameTaskbar->resize(w, th); - _ip->setMaximumSize(w, uh); - _ip->resize(w,uh); + if (!_frame->image().isNull()) + { + //move(0,0); + resize(w, h); + } } void ConnectionFrame::setSource() diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h index 84f8549..a0334bc 100644 --- a/src/gui/connectionFrame.h +++ b/src/gui/connectionFrame.h @@ -118,7 +118,6 @@ public: void setFrameRate(int newRate); bool isClientOnline; void paintCloseUp(int w, int h); - void resizeComponent(int w, int h); void setSource(); void setTarget(); void setUnproject(); diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp index b4dd17c..4eae44e 100644 --- a/src/gui/mainWindow.cpp +++ b/src/gui/mainWindow.cpp @@ -645,47 +645,8 @@ void MainWindow::changeEvent(QEvent *e) */ void MainWindow::resizeEvent(QResizeEvent *event) { - if (bgimage == true) - { repaintbackgroundpicture(); // repaint the backgroundpicture scaled to the window size - } - - if (_firstResize == 3) - { - QSize oldSize = event->oldSize(); - _initW = ui->widget->width(); - _initH = ui->widget->height(); - _firstResize++; - } - std::list* selectedClients = - MainWindow::getConnectionList()->getSelectedClients(); - if (is_closeup && selectedClients->size() == 1) - { - PVSClient* pvsClient = - PVSConnectionManager::getManager()->getClientFromIp( - selectedClients->front().toStdString().c_str()); - pvsClient->getConnectionFrame()->paintCloseUp(ui->widget->width(), - ui->widget->height()); - } - else if (!is_closeup && _firstResize > 3) - { - int ratio_w = (ui->widget->width() * 100) / _initW; - int ratio_h = (ui->widget->height() * 100) / _initH; -foreach (ConnectionFrame* cf, getConnectionWindow()->getFrameList()) - { - /*int margin = ui->widget->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin); - int x = ui->widget->width() - margin; - int y = ui->widget->height() - margin; - updatePos(cf, x, y);*/ - int w = (cf->init_w * ratio_w) / 100; - int h = (cf->init_h * ratio_h) / 100; - cf->paintCloseUp(w,h); - } -} - -if (_firstResize < 3) -_firstResize++; } void MainWindow::updatePos(ConnectionFrame* cf, int x, int y) -- cgit v1.2.3-55-g7522 From e4f5d0360fd688291809e6949a94fa7010e12759 Mon Sep 17 00:00:00 2001 From: Johann Latocha Date: Thu, 10 Mar 2011 00:07:41 +0100 Subject: Bigger icons on thumbs --- src/gui/connectionFrame.h | 4 ++-- src/gui/frame.cpp | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/gui') diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h index a0334bc..fe6dc95 100644 --- a/src/gui/connectionFrame.h +++ b/src/gui/connectionFrame.h @@ -144,8 +144,8 @@ public Q_SLOTS: protected: //virtual void paintEvent(QPaintEvent *event); void mouseReleaseEvent ( QMouseEvent * e ); - virtual void enterEvent ( QEvent * event ); - virtual void leaveEvent ( QEvent * event ); + virtual void enterEvent ( QEvent * event ); + virtual void leaveEvent ( QEvent * event ); void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); //void mouseReleaseEvent ( QMouseEvent * event ); diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp index 7b3bf16..6054065 100644 --- a/src/gui/frame.cpp +++ b/src/gui/frame.cpp @@ -36,13 +36,10 @@ Frame::Frame(const QString & text, QWidget * parent) : Y = 0; setBackgroundRole(QPalette::Base); - setStyleSheet(QString::fromUtf8("QLabel{border-radius:10px;\n" - "background-color: rgb(150,150,150);}")); - - setAlignment(Qt::AlignCenter); + setAlignment(Qt::AlignCenter); setAutoFillBackground(true); - setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + setFrameStyle(QFrame::StyledPanel | QFrame::Plain); _isLocked = false; _dozent = false; @@ -82,7 +79,6 @@ Frame::Frame(const QString & text, QWidget * parent) : _specialEventTimer->setSingleShot(true); connect(_specialEventTimer, SIGNAL(timeout()), this, SLOT(showSpecialEventMenu())); - setStyleSheet("background-color: #DCDCDC;border: 0px solid #DCDCDC;"); } Frame::~Frame() @@ -294,19 +290,17 @@ QToolButton* Frame::createToolButton(const QString &toolTip, const QIcon &icon, QToolButton *button = new QToolButton(this); button->setToolTip(toolTip); button->setIcon(icon); - button->setIconSize(QSize(15, 15)); - button->setStyleSheet(QString::fromUtf8("background-color: rgb(230, 230, 230);")); + button->setIconSize(QSize(30, 30)); addButton(button); toolButtonList.append(button); connect(button, SIGNAL(clicked()), this, member); - return button; } void Frame::addButton(QToolButton *button) { button->move(X,Y); - Y += button->size().height()-5; + Y += button->size().height() + 10; } void Frame::setToolButtonListVisible(bool visible) @@ -505,6 +499,7 @@ void Frame::updateMousePosition(QMouseEvent* event) void Frame::enterEvent(QEvent* event) { + QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor)); _mouseOver = true; if(_remoteControlEnabled) { @@ -514,6 +509,7 @@ void Frame::enterEvent(QEvent* event) void Frame::leaveEvent(QEvent* event) { + QApplication::setOverrideCursor(QCursor(Qt::OpenHandCursor)); _mouseOver = false; if(_remoteControlEnabled) { -- cgit v1.2.3-55-g7522