Mercurial > octave-nkf

changeset 13363:d09eb4ace2c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed terminal class.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Thu, 07 Apr 2011 12:51:31 +0200
parents c3446170dbc3
children 96ef8177889a
files gui//Makefile gui//QTerminalWidget.h gui//Quint gui//Quint.pro gui//TerminalMdiSubWindow.cpp gui//TerminalMdiSubWindow.h gui//mainwindow.cpp gui//terminal.cpp gui//terminal.h
diffstat 9 files changed, 75 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/gui//Makefile	Thu Apr 07 12:40:49 2011 +0200
+++ b/gui//Makefile	Thu Apr 07 12:51:31 2011 +0200
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Quint
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 12:14:44 2011
+# Generated by qmake (2.01a) (Qt 4.7.2) on: Do. Apr 7 12:51:02 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
@@ -45,7 +45,6 @@
 
 SOURCES       = main.cpp \
 		mainwindow.cpp \
-		terminal.cpp \
 		TerminalCharacterDecoder.cpp \
 		KeyboardTranslator.cpp \
 		Screen.cpp \
@@ -63,8 +62,8 @@
 		k3processcontroller.cpp \
 		Session.cpp \
 		ShellCommand.cpp \
-		QTerminalWidget.cpp moc_mainwindow.cpp \
-		moc_terminal.cpp \
+		QTerminalWidget.cpp \
+		TerminalMdiSubWindow.cpp moc_mainwindow.cpp \
 		moc_ScreenWindow.cpp \
 		moc_Emulation.cpp \
 		moc_Vt102Emulation.cpp \
@@ -74,10 +73,10 @@
 		moc_k3process.cpp \
 		moc_k3processcontroller.cpp \
 		moc_Session.cpp \
-		moc_QTerminalWidget.cpp
+		moc_QTerminalWidget.cpp \
+		moc_TerminalMdiSubWindow.cpp
 OBJECTS       = object-files/main.o \
 		object-files/mainwindow.o \
-		object-files/terminal.o \
 		object-files/TerminalCharacterDecoder.o \
 		object-files/KeyboardTranslator.o \
 		object-files/Screen.o \
@@ -96,8 +95,8 @@
 		object-files/Session.o \
 		object-files/ShellCommand.o \
 		object-files/QTerminalWidget.o \
+		object-files/TerminalMdiSubWindow.o \
 		object-files/moc_mainwindow.o \
-		object-files/moc_terminal.o \
 		object-files/moc_ScreenWindow.o \
 		object-files/moc_Emulation.o \
 		object-files/moc_Vt102Emulation.o \
@@ -107,7 +106,8 @@
 		object-files/moc_k3process.o \
 		object-files/moc_k3processcontroller.o \
 		object-files/moc_Session.o \
-		object-files/moc_QTerminalWidget.o
+		object-files/moc_QTerminalWidget.o \
+		object-files/moc_TerminalMdiSubWindow.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 terminal.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 object-files/Quint1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp terminal.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 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 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
 
 
 clean:compiler_clean 
@@ -233,15 +233,12 @@
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: moc_mainwindow.cpp moc_terminal.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
+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_clean:
-	-$(DEL_FILE) moc_mainwindow.cpp moc_terminal.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
+	-$(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
 
-moc_terminal.cpp: terminal.h
-	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) terminal.h -o moc_terminal.cpp
-
 moc_ScreenWindow.cpp: Character.h \
 		CharacterColor.h \
 		ScreenWindow.h
@@ -292,6 +289,10 @@
 moc_QTerminalWidget.cpp: QTerminalWidget.h
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) QTerminalWidget.h -o moc_QTerminalWidget.cpp
 
+moc_TerminalMdiSubWindow.cpp: QTerminalWidget.h \
+		TerminalMdiSubWindow.h
+	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) TerminalMdiSubWindow.h -o moc_TerminalMdiSubWindow.cpp
+
 compiler_rcc_make_all:
 compiler_rcc_clean:
 compiler_image_collection_make_all: qmake_image_collection.cpp
@@ -315,12 +316,10 @@
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/main.o main.cpp
 
 object-files/mainwindow.o: mainwindow.cpp mainwindow.h \
-		terminal.h
+		TerminalMdiSubWindow.h \
+		QTerminalWidget.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/mainwindow.o mainwindow.cpp
 
-object-files/terminal.o: terminal.cpp terminal.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/terminal.o terminal.cpp
-
 object-files/TerminalCharacterDecoder.o: TerminalCharacterDecoder.cpp TerminalCharacterDecoder.h \
 		Character.h \
 		CharacterColor.h
@@ -434,7 +433,8 @@
 object-files/ShellCommand.o: ShellCommand.cpp ShellCommand.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/ShellCommand.o ShellCommand.cpp
 
-object-files/QTerminalWidget.o: QTerminalWidget.cpp Session.h \
+object-files/QTerminalWidget.o: QTerminalWidget.cpp QTerminalWidget.h \
+		Session.h \
 		History.h \
 		BlockArray.h \
 		Character.h \
@@ -444,12 +444,13 @@
 		ColorTables.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/QTerminalWidget.o QTerminalWidget.cpp
 
+object-files/TerminalMdiSubWindow.o: TerminalMdiSubWindow.cpp TerminalMdiSubWindow.h \
+		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/moc_terminal.o: moc_terminal.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_terminal.o moc_terminal.cpp
-
 object-files/moc_ScreenWindow.o: moc_ScreenWindow.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_ScreenWindow.o moc_ScreenWindow.cpp
 
@@ -480,6 +481,9 @@
 object-files/moc_QTerminalWidget.o: moc_QTerminalWidget.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_QTerminalWidget.o moc_QTerminalWidget.cpp
 
+object-files/moc_TerminalMdiSubWindow.o: moc_TerminalMdiSubWindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object-files/moc_TerminalMdiSubWindow.o moc_TerminalMdiSubWindow.cpp
+
 ####### Install
 
 install:   FORCE
--- a/gui//QTerminalWidget.h	Thu Apr 07 12:40:49 2011 +0200
+++ b/gui//QTerminalWidget.h	Thu Apr 07 12:51:31 2011 +0200
@@ -1,5 +1,5 @@
 /*  Copyright (C) 2008 e_k (e_k@users.sourceforge.net)
-    
+
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
Binary file gui//Quint has changed
--- a/gui//Quint.pro	Thu Apr 07 12:40:49 2011 +0200
+++ b/gui//Quint.pro	Thu Apr 07 12:51:31 2011 +0200
@@ -11,7 +11,6 @@
 DEFINES += HAVE_POSIX_OPENPT
 SOURCES += main.cpp\
         mainwindow.cpp \
-        terminal.cpp \
         TerminalCharacterDecoder.cpp \
         KeyboardTranslator.cpp \
         Screen.cpp \
@@ -29,10 +28,10 @@
         k3processcontroller.cpp \
         Session.cpp \
         ShellCommand.cpp \
-        QTerminalWidget.cpp
+        QTerminalWidget.cpp \
+        TerminalMdiSubWindow.cpp
 
 HEADERS += mainwindow.h \
-        terminal.h \
         TerminalCharacterDecoder.h \
         Character.h \
         CharacterColor.h \
@@ -55,4 +54,5 @@
         k3processcontroller.h \
         Session.h \
         ShellCommand.h \
-        QTerminalWidget.h
+        QTerminalWidget.h \
+        TerminalMdiSubWindow.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui//TerminalMdiSubWindow.cpp	Thu Apr 07 12:51:31 2011 +0200
@@ -0,0 +1,23 @@
+#include "TerminalMdiSubWindow.h"
+
+TerminalMdiSubWindow::TerminalMdiSubWindow()
+    : QMdiSubWindow(),
+      m_terminalWidget(0) {
+    setWindowTitle("Terminal Session");
+    resize(800, 400);
+    launchTerminal();
+}
+
+void TerminalMdiSubWindow::launchTerminal() {
+    delete m_terminalWidget;
+    m_terminalWidget = new QTerminalWidget(0, this);
+    m_terminalWidget->setScrollBarPosition(QTerminalWidget::ScrollBarRight);
+    setWidget(m_terminalWidget);
+
+    QString programName = "octave";
+    m_terminalWidget->setShellProgram(programName);
+    m_terminalWidget->startShellProgram();
+    setFocus();
+
+    connect(m_terminalWidget, SIGNAL(finished()), this, SLOT(launchTerminal()));
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui//TerminalMdiSubWindow.h	Thu Apr 07 12:51:31 2011 +0200
@@ -0,0 +1,19 @@
+#ifndef TERMINALMDISUBWINDOW_H
+#define TERMINALMDISUBWINDOW_H
+
+#include <QMdiSubWindow>
+#include "QTerminalWidget.h"
+
+class TerminalMdiSubWindow : public QMdiSubWindow {
+    Q_OBJECT
+public:
+    TerminalMdiSubWindow();
+
+private slots:
+    void launchTerminal();
+
+private:
+    QTerminalWidget *m_terminalWidget;
+};
+
+#endif // TERMINALMDISUBWINDOW_H
--- a/gui//mainwindow.cpp	Thu Apr 07 12:40:49 2011 +0200
+++ b/gui//mainwindow.cpp	Thu Apr 07 12:51:31 2011 +0200
@@ -22,7 +22,7 @@
 #include <QtWebKit/QWebView>
 
 #include "mainwindow.h"
-#include "terminal.h"
+#include "TerminalMdiSubWindow.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent) {
@@ -41,7 +41,7 @@
 }
 
 void MainWindow::addTerminalWindow() {
-    Terminal *terminal = new Terminal;
+    TerminalMdiSubWindow *terminal = new TerminalMdiSubWindow;
     m_mdiArea->addSubWindow(terminal);
 }
 
--- a/gui//terminal.cpp	Thu Apr 07 12:40:49 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#include "terminal.h"
-
-Terminal::Terminal()
-    : QMdiSubWindow(),
-      m_terminalWidget(0) {
-    setWindowTitle("Terminal Session");
-    resize(800, 400);
-    launchTerminal();
-}
-
-void Terminal::launchTerminal() {
-    delete m_terminalWidget;
-    m_terminalWidget = new QTerminalWidget(0, this);
-    m_terminalWidget->setScrollBarPosition(QTerminalWidget::ScrollBarRight);
-    setWidget(m_terminalWidget);
-
-    QString programName = "octave";
-    m_terminalWidget->setShellProgram(programName);
-    m_terminalWidget->startShellProgram();
-    setFocus();
-
-    connect(m_terminalWidget, SIGNAL(finished()), this, SLOT(launchTerminal()));
-}
--- a/gui//terminal.h	Thu Apr 07 12:40:49 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#ifndef TERMINAL_H
-#define TERMINAL_H
-
-#include <QMdiSubWindow>
-#include "QTerminalWidget.h"
-
-class Terminal : public QMdiSubWindow {
-    Q_OBJECT
-public:
-    Terminal();
-
-private slots:
-    void launchTerminal();
-
-private:
-    QTerminalWidget *m_terminalWidget;
-};
-
-#endif // TERMINAL_H