Mercurial > octave-nkf

changeset 14289:fdd5828e2214 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed ImageViewer. Removed stylesheets from dock widgets. * FilesDockWidget.cpp: Removed stylesheet. * HistoryDockWidget.cpp: Removed stylesheet. * WorkspaceView.cpp: Removed stylesheet.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Tue, 31 Jan 2012 00:33:56 +0100
parents e7d9e6d8c6b5
children faece6b2ab90
files gui/octave-gui.pro gui/src/FilesDockWidget.cpp gui/src/HistoryDockWidget.cpp gui/src/ImageViewerMdiSubWindow.cpp gui/src/ImageViewerMdiSubWindow.h gui/src/MainWindow.cpp gui/src/WorkspaceView.cpp
diffstat 7 files changed, 0 insertions(+), 113 deletions(-) [+]
line wrap: on
line diff
--- a/gui/octave-gui.pro	Tue Jan 31 00:23:03 2012 +0100
+++ b/gui/octave-gui.pro	Tue Jan 31 00:33:56 2012 +0100
@@ -80,7 +80,6 @@
     src/FilesDockWidget.cpp \
     src/FileEditorMdiSubWindow.cpp \
     src/BrowserWidget.cpp \
-    src/ImageViewerMdiSubWindow.cpp \
     src/SettingsDialog.cpp \
     src/OctaveGUI.cpp \
     src/ResourceManager.cpp \
@@ -103,7 +102,6 @@
     src/FilesDockWidget.h \
     src/FileEditorMdiSubWindow.h \
     src/BrowserWidget.h \
-    src/ImageViewerMdiSubWindow.h \
     src/SettingsDialog.h \
     src/ResourceManager.h \
     src/CommandLineParser.h \
--- a/gui/src/FilesDockWidget.cpp	Tue Jan 31 00:23:03 2012 +0100
+++ b/gui/src/FilesDockWidget.cpp	Tue Jan 31 00:33:56 2012 +0100
@@ -99,17 +99,6 @@
   m_currentDirectory->setCompleter (completer);
 
   connect (this, SIGNAL (visibilityChanged(bool)), this, SLOT(handleVisibilityChanged(bool)));
-
-  setStyleSheet(
-      " QDockWidget { "
-      "   border:1px solid rgba(200, 200, 200, 255); "
-      "   background-color: qlineargradient(spread:pad, "
-      "   x1:0.1, y1:0, x2:0.9, y2:1, "
-      "   stop:0.256444 rgba(215, 215, 255, 255), "
-      "   stop:0.550888 rgba(255, 255, 255, 255), "
-      "   stop:0.780424 rgba(215, 215, 255, 255)); "
-      " } "
-      );
 }
 
 void
--- a/gui/src/HistoryDockWidget.cpp	Tue Jan 31 00:23:03 2012 +0100
+++ b/gui/src/HistoryDockWidget.cpp	Tue Jan 31 00:33:56 2012 +0100
@@ -49,17 +49,6 @@
   connect (m_filterLineEdit, SIGNAL (textEdited (QString)), &m_sortFilterProxyModel, SLOT (setFilterWildcard(QString)));
   connect (m_historyListView, SIGNAL (doubleClicked (QModelIndex)), this, SLOT (handleDoubleClick (QModelIndex)));
   connect (this, SIGNAL (visibilityChanged(bool)), this, SLOT(handleVisibilityChanged(bool)));
-
-  setStyleSheet(
-      " QDockWidget { "
-      "   border:1px solid rgba(200, 200, 200, 255); "
-      "   background-color: qlineargradient(spread:pad, "
-      "   x1:0.1, y1:0, x2:0.9, y2:1, "
-      "   stop:0.256444 rgba(215, 255, 215, 255), "
-      "   stop:0.550888 rgba(255, 255, 255, 255), "
-      "   stop:0.780424 rgba(215, 255, 215, 255)); "
-      " } "
-      );
 }
 
 void
--- a/gui/src/ImageViewerMdiSubWindow.cpp	Tue Jan 31 00:23:03 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/* OctaveGUI - A graphical user interface for Octave
- * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ImageViewerMdiSubWindow.h"
-#include <QLabel>
-#include <QPixmap>
-#include <QScrollArea>
-
-ImageViewerMdiSubWindow::ImageViewerMdiSubWindow (QPixmap pixmap, QWidget * parent):QMdiSubWindow (parent),
-m_pixmap
-(pixmap)
-{
-  construct ();
-}
-
-void
-ImageViewerMdiSubWindow::construct ()
-{
-  QLabel *label = new QLabel ();
-  label->setBackgroundRole (QPalette::Base);
-  label->setSizePolicy (QSizePolicy::Ignored, QSizePolicy::Ignored);
-  label->setScaledContents (true);
-  label->setPixmap (m_pixmap);
-
-  QScrollArea *scrollArea = new QScrollArea (this);
-  scrollArea->setBackgroundRole (QPalette::Dark);
-  scrollArea->setWidget (label);
-  setWidget (scrollArea);
-}
--- a/gui/src/ImageViewerMdiSubWindow.h	Tue Jan 31 00:23:03 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/* OctaveGUI - A graphical user interface for Octave
- * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef IMAGEVIEWERMDISUBWINDOW_H
-#define IMAGEVIEWERMDISUBWINDOW_H
-
-#include <QMdiSubWindow>
-
-class ImageViewerMdiSubWindow:public QMdiSubWindow
-{
-public:
-  ImageViewerMdiSubWindow (QPixmap pixmap, QWidget * parent = 0);
-
-private:
-  void construct ();
-  QPixmap m_pixmap;
-};
-
-#endif // IMAGEVIEWERMDISUBWINDOW_H
--- a/gui/src/MainWindow.cpp	Tue Jan 31 00:23:03 2012 +0100
+++ b/gui/src/MainWindow.cpp	Tue Jan 31 00:33:56 2012 +0100
@@ -24,7 +24,6 @@
 #include <QMessageBox>
 #include "MainWindow.h"
 #include "FileEditorMdiSubWindow.h"
-#include "ImageViewerMdiSubWindow.h"
 #include "SettingsDialog.h"
 
 #define VERSION_STRING "Octave GUI (0.8.8)"
--- a/gui/src/WorkspaceView.cpp	Tue Jan 31 00:23:03 2012 +0100
+++ b/gui/src/WorkspaceView.cpp	Tue Jan 31 00:33:56 2012 +0100
@@ -60,18 +60,6 @@
   m_variablesTreeWidget->setAnimated (true);
 
   connect (this, SIGNAL (visibilityChanged(bool)), this, SLOT(handleVisibilityChanged(bool)));
-
-  setStyleSheet(
-      " QDockWidget { "
-      "   border:1px solid rgba(200, 200, 200, 255); "
-      "   background-color: qlineargradient(spread:pad, "
-      "   x1:0.1, y1:0, x2:0.9, y2:1, "
-      "   stop:0.256444 rgba(255, 215, 215, 255), "
-      "   stop:0.550888 rgba(255, 255, 255, 255), "
-      "   stop:0.780424 rgba(255, 215, 215, 255)); "
-      " } "
-      );
-
   connect (OctaveLink::instance(), SIGNAL (symbolTableChanged()), this, SLOT (fetchSymbolTable()));
 }