Mercurial > octave-nkf

changeset 13365:21f1fb9834ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed some files.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Thu, 07 Apr 2011 14:54:00 +0200
parents 96ef8177889a
children 4127a03d3309
files gui//MainWindow.cpp gui//MainWindow.h gui//Makefile gui//Quint gui//Quint.cpp gui//Quint.pro gui//main.cpp gui//mainwindow.cpp gui//mainwindow.h
diffstat 9 files changed, 163 insertions(+), 161 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui//MainWindow.cpp	Thu Apr 07 14:54:00 2011 +0200
@@ -0,0 +1,54 @@
+/* Quint - 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 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QMenuBar>
+#include <QMenu>
+#include <QAction>
+#include <QtWebKit/QWebView>
+
+#include "MainWindow.h"
+#include "TerminalMdiSubWindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent) {
+    m_mdiArea = new QMdiArea();
+    setCentralWidget(m_mdiArea);
+
+    loadWebPage("Online Manual", "http://www.gnu.org/software/octave/doc/interpreter/");
+    addTerminalWindow();
+    addTerminalWindow();
+    m_mdiArea->setViewMode(QMdiArea::SubWindowView);
+    showMaximized();
+}
+
+MainWindow::~MainWindow() {
+
+}
+
+void MainWindow::addTerminalWindow() {
+    TerminalMdiSubWindow *terminal = new TerminalMdiSubWindow;
+    m_mdiArea->addSubWindow(terminal);
+}
+
+void MainWindow::loadWebPage(QString title, QString url) {
+
+    QWebView *webView = new QWebView();
+    webView->setWindowTitle(title);
+    webView->load(QUrl(url));
+    m_mdiArea->addSubWindow(webView);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui//MainWindow.h	Thu Apr 07 14:54:00 2011 +0200
@@ -0,0 +1,45 @@
+/* Quint - 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 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+#include <QMdiArea>
+
+/**
+  * \class MainWindow
+  *
+  * Represents the main window.
+  */
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+    void addTerminalWindow();
+    void loadWebPage(QString title, QString url);
+
+private:
+    QMdiArea *m_mdiArea;
+};
+
+#endif // MAINWINDOW_H
--- a/gui//Makefile	Thu Apr 07 14:19:15 2011 +0200
+++ b/gui//Makefile	Thu Apr 07 14:54:00 2011 +0200
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Quint
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 12:51:02 2011
+# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 14:53:34 2011
 # Project:  Quint.pro
 # Template: app
 # Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Quint.pro
@@ -43,9 +43,7 @@
 
 ####### Files
 
-SOURCES       = main.cpp \
-		mainwindow.cpp \
-		TerminalCharacterDecoder.cpp \
+SOURCES       = TerminalCharacterDecoder.cpp \
 		KeyboardTranslator.cpp \
 		Screen.cpp \
 		History.cpp \
@@ -63,8 +61,9 @@
 		Session.cpp \
 		ShellCommand.cpp \
 		QTerminalWidget.cpp \
-		TerminalMdiSubWindow.cpp moc_mainwindow.cpp \
-		moc_ScreenWindow.cpp \
+		TerminalMdiSubWindow.cpp \
+		MainWindow.cpp \
+		Quint.cpp moc_ScreenWindow.cpp \
 		moc_Emulation.cpp \
 		moc_Vt102Emulation.cpp \
 		moc_TerminalDisplay.cpp \
@@ -74,10 +73,9 @@
 		moc_k3processcontroller.cpp \
 		moc_Session.cpp \
 		moc_QTerminalWidget.cpp \
-		moc_TerminalMdiSubWindow.cpp
-OBJECTS       = object-files/main.o \
-		object-files/mainwindow.o \
-		object-files/TerminalCharacterDecoder.o \
+		moc_TerminalMdiSubWindow.cpp \
+		moc_MainWindow.cpp
+OBJECTS       = object-files/TerminalCharacterDecoder.o \
 		object-files/KeyboardTranslator.o \
 		object-files/Screen.o \
 		object-files/History.o \
@@ -96,7 +94,8 @@
 		object-files/ShellCommand.o \
 		object-files/QTerminalWidget.o \
 		object-files/TerminalMdiSubWindow.o \
-		object-files/moc_mainwindow.o \
+		object-files/MainWindow.o \
+		object-files/Quint.o \
 		object-files/moc_ScreenWindow.o \
 		object-files/moc_Emulation.o \
 		object-files/moc_Vt102Emulation.o \
@@ -107,7 +106,8 @@
 		object-files/moc_k3processcontroller.o \
 		object-files/moc_Session.o \
 		object-files/moc_QTerminalWidget.o \
-		object-files/moc_TerminalMdiSubWindow.o
+		object-files/moc_TerminalMdiSubWindow.o \
+		object-files/moc_MainWindow.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -212,7 +212,7 @@
 
 dist: 
 	@$(CHK_DIR_EXISTS) object-files/Quint1.0.0 || $(MKDIR) object-files/Quint1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) object-files/Quint1.0.0/ && $(COPY_FILE) --parents mainwindow.h TerminalCharacterDecoder.h Character.h CharacterColor.h KeyboardTranslator.h ExtendedDefaultTranslator.h Screen.h History.h BlockArray.h konsole_wcwidth.h ScreenWindow.h Emulation.h Vt102Emulation.h TerminalDisplay.h Filter.h LineFont.h Pty.h kpty.h kpty_p.h k3process.h k3processcontroller.h Session.h ShellCommand.h QTerminalWidget.h TerminalMdiSubWindow.h object-files/Quint1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp TerminalCharacterDecoder.cpp KeyboardTranslator.cpp Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp ScreenWindow.cpp Emulation.cpp Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp Session.cpp ShellCommand.cpp QTerminalWidget.cpp TerminalMdiSubWindow.cpp object-files/Quint1.0.0/ && (cd `dirname object-files/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname object-files/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r object-files/Quint1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) object-files/Quint1.0.0/ && $(COPY_FILE) --parents TerminalCharacterDecoder.h Character.h CharacterColor.h KeyboardTranslator.h ExtendedDefaultTranslator.h Screen.h History.h BlockArray.h konsole_wcwidth.h ScreenWindow.h Emulation.h Vt102Emulation.h TerminalDisplay.h Filter.h LineFont.h Pty.h kpty.h kpty_p.h k3process.h k3processcontroller.h Session.h ShellCommand.h QTerminalWidget.h TerminalMdiSubWindow.h MainWindow.h object-files/Quint1.0.0/ && $(COPY_FILE) --parents TerminalCharacterDecoder.cpp KeyboardTranslator.cpp Screen.cpp History.cpp BlockArray.cpp konsole_wcwidth.cpp ScreenWindow.cpp Emulation.cpp Vt102Emulation.cpp TerminalDisplay.cpp Filter.cpp Pty.cpp kpty.cpp k3process.cpp k3processcontroller.cpp Session.cpp ShellCommand.cpp QTerminalWidget.cpp TerminalMdiSubWindow.cpp MainWindow.cpp Quint.cpp object-files/Quint1.0.0/ && (cd `dirname object-files/Quint1.0.0` && $(TAR) Quint1.0.0.tar Quint1.0.0 && $(COMPRESS) Quint1.0.0.tar) && $(MOVE) `dirname object-files/Quint1.0.0`/Quint1.0.0.tar.gz . && $(DEL_FILE) -r object-files/Quint1.0.0
 
 
 clean:compiler_clean 
@@ -233,12 +233,9 @@
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_mainwindow.cpp moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp
+compiler_moc_header_make_all: moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp moc_MainWindow.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) moc_mainwindow.cpp moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp
-moc_mainwindow.cpp: mainwindow.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mainwindow.h -o moc_mainwindow.cpp
-
+	-$(DEL_FILE) moc_ScreenWindow.cpp moc_Emulation.cpp moc_Vt102Emulation.cpp moc_TerminalDisplay.cpp moc_Filter.cpp moc_Pty.cpp moc_k3process.cpp moc_k3processcontroller.cpp moc_Session.cpp moc_QTerminalWidget.cpp moc_TerminalMdiSubWindow.cpp moc_MainWindow.cpp
 moc_ScreenWindow.cpp: Character.h \
 		CharacterColor.h \
 		ScreenWindow.h
@@ -293,6 +290,9 @@
 		TerminalMdiSubWindow.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) TerminalMdiSubWindow.h -o moc_TerminalMdiSubWindow.cpp
 
+moc_MainWindow.cpp: MainWindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) MainWindow.h -o moc_MainWindow.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -312,14 +312,6 @@
 
 ####### Compile
 
-object-files/main.o: main.cpp mainwindow.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/main.o main.cpp
-
-object-files/mainwindow.o: mainwindow.cpp mainwindow.h \
-		TerminalMdiSubWindow.h \
-		QTerminalWidget.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/mainwindow.o mainwindow.cpp
-
 object-files/TerminalCharacterDecoder.o: TerminalCharacterDecoder.cpp TerminalCharacterDecoder.h \
 		Character.h \
 		CharacterColor.h
@@ -448,8 +440,13 @@
 		QTerminalWidget.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/TerminalMdiSubWindow.o TerminalMdiSubWindow.cpp
 
-object-files/moc_mainwindow.o: moc_mainwindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_mainwindow.o moc_mainwindow.cpp
+object-files/MainWindow.o: MainWindow.cpp MainWindow.h \
+		TerminalMdiSubWindow.h \
+		QTerminalWidget.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/MainWindow.o MainWindow.cpp
+
+object-files/Quint.o: Quint.cpp MainWindow.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/Quint.o Quint.cpp
 
 object-files/moc_ScreenWindow.o: moc_ScreenWindow.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_ScreenWindow.o moc_ScreenWindow.cpp
@@ -484,6 +481,9 @@
 object-files/moc_TerminalMdiSubWindow.o: moc_TerminalMdiSubWindow.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalMdiSubWindow.o moc_TerminalMdiSubWindow.cpp
 
+object-files/moc_MainWindow.o: moc_MainWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_MainWindow.o moc_MainWindow.cpp
+
 ####### Install
 
 install:   FORCE
Binary file gui//Quint has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui//Quint.cpp	Thu Apr 07 14:54:00 2011 +0200
@@ -0,0 +1,29 @@
+/* Quint - 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 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtGui/QApplication>
+#include "MainWindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
--- a/gui//Quint.pro	Thu Apr 07 14:19:15 2011 +0200
+++ b/gui//Quint.pro	Thu Apr 07 14:54:00 2011 +0200
@@ -9,8 +9,7 @@
 TARGET = Quint
 TEMPLATE = app
 DEFINES += HAVE_POSIX_OPENPT
-SOURCES += main.cpp\
-        mainwindow.cpp \
+SOURCES +=\
         TerminalCharacterDecoder.cpp \
         KeyboardTranslator.cpp \
         Screen.cpp \
@@ -29,9 +28,11 @@
         Session.cpp \
         ShellCommand.cpp \
         QTerminalWidget.cpp \
-        TerminalMdiSubWindow.cpp
+        TerminalMdiSubWindow.cpp \
+    MainWindow.cpp \
+    Quint.cpp
 
-HEADERS += mainwindow.h \
+HEADERS += \
         TerminalCharacterDecoder.h \
         Character.h \
         CharacterColor.h \
@@ -55,4 +56,5 @@
         Session.h \
         ShellCommand.h \
         QTerminalWidget.h \
-        TerminalMdiSubWindow.h
+        TerminalMdiSubWindow.h \
+    MainWindow.h
--- a/gui//main.cpp	Thu Apr 07 14:19:15 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Quint - 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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtGui/QApplication>
-#include "mainwindow.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    MainWindow w;
-    w.show();
-
-    return a.exec();
-}
--- a/gui//mainwindow.cpp	Thu Apr 07 14:19:15 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/* Quint - 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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QMenuBar>
-#include <QMenu>
-#include <QAction>
-#include <QtWebKit/QWebView>
-
-#include "mainwindow.h"
-#include "TerminalMdiSubWindow.h"
-
-MainWindow::MainWindow(QWidget *parent)
-    : QMainWindow(parent) {
-    m_mdiArea = new QMdiArea();
-    setCentralWidget(m_mdiArea);
-
-    loadWebPage("Online Manual", "http://www.gnu.org/software/octave/doc/interpreter/");
-    addTerminalWindow();
-    addTerminalWindow();
-    m_mdiArea->setViewMode(QMdiArea::SubWindowView);
-    showMaximized();
-}
-
-MainWindow::~MainWindow() {
-
-}
-
-void MainWindow::addTerminalWindow() {
-    TerminalMdiSubWindow *terminal = new TerminalMdiSubWindow;
-    m_mdiArea->addSubWindow(terminal);
-}
-
-void MainWindow::loadWebPage(QString title, QString url) {
-
-    QWebView *webView = new QWebView();
-    webView->setWindowTitle(title);
-    webView->load(QUrl(url));
-    m_mdiArea->addSubWindow(webView);
-}
--- a/gui//mainwindow.h	Thu Apr 07 14:19:15 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/* Quint - 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 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QtGui/QMainWindow>
-#include <QMdiArea>
-
-/**
-  * \class MainWindow
-  *
-  * Represents the main window.
-  */
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-
-    void addTerminalWindow();
-    void loadWebPage(QString title, QString url);
-
-private:
-    QMdiArea *m_mdiArea;
-};
-
-#endif // MAINWINDOW_H