summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-07-02 21:11:53 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-02 21:11:53 +0000
commitc2fd5f3f9f19914fc7a1e41ffdc9935f54022b49 (patch)
tree2f485e7212c810d1b93600aecb7b412cc5c66088 /packages
parenteaa94a9c8ad9a688958f8a5f050833226aa4d964 (diff)
opie-console 1.2.2 remove bug fixes that have been applied upstream
Diffstat (limited to 'packages')
-rw-r--r--packages/opie-console/opie-console-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff25
-rw-r--r--packages/opie-console/opie-console-1.2.1/1647-bugfix.patch40
-rw-r--r--packages/opie-console/opie-console-1.2.1/1686-bugfix.patch146
-rw-r--r--packages/opie-console/opie-console_1.2.2.bb5
5 files changed, 1 insertions, 215 deletions
diff --git a/packages/opie-console/opie-console-1.2.1/.mtn2git_empty b/packages/opie-console/opie-console-1.2.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-console/opie-console-1.2.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
deleted file mode 100644
index e871e8e1e4..0000000000
--- a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: terminalwidget.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v
-retrieving revision 1.12
-diff -u -u -r1.12 terminalwidget.cpp
---- opie-console/terminalwidget.cpp 16 Oct 2004 21:06:28 -0000 1.12
-+++ opie-console/terminalwidget.cpp 17 Jan 2006 10:00:13 -0000
-@@ -1,4 +1,5 @@
- #include "terminalwidget.h"
-+#include <qpe/config.h>
-
- /* QT */
- #include <qlabel.h>
-@@ -151,8 +152,10 @@
- break;
- };
-
-+ Config qpecfg("qpe");
-+ qpecfg.setGroup("Appearance");
-
-- m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") );
-+ m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
-
- // switch( fontsize ) {
- // case Profile::Micro:
diff --git a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
deleted file mode 100644
index c4603333cf..0000000000
--- a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: opie-console/TEWidget.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/TEWidget.cpp,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -u -r1.13 -r1.14
---- opie-console/TEWidget.cpp 21 Jan 2005 19:56:17 -0000 1.13
-+++ opie-console/TEWidget.cpp 18 Oct 2005 13:56:12 -0000 1.14
-@@ -320,16 +320,21 @@
-
- Config cfg("Konsole");
- cfg.setGroup("ScrollBar");
-- switch( cfg.readNumEntry("Position",2)){
-- case 0:
-- scrollLoc = SCRNONE;
-- break;
-- case 1:
-- scrollLoc = SCRLEFT;
-- break;
-- case 2:
-- scrollLoc = SCRRIGHT;
-- break;
-+
-+ scrollLoc = cfg.readNumEntry("Position", -1);
-+
-+ // bugfix for #1647
-+ // if user set 'show scrollbar on left' then let it be on left
-+ // but only if it is not set in opie-console itself
-+ if(scrollLoc == -1)
-+ {
-+ Config qpecfg ("qpe");
-+ qpecfg.setGroup("Appearance");
-+ scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT);
-+ if(scrollLoc == 0) // user set LeftHand in past and switched it off later
-+ {
-+ scrollLoc = SCRRIGHT;
-+ }
- };
-
- blinkT = new QTimer(this);
diff --git a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch
deleted file mode 100644
index f615581b32..0000000000
--- a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Index: emulation_handler.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.cpp,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -u -r1.25 -r1.26
---- opie-console/emulation_handler.cpp 11 Jun 2005 12:22:32 -0000 1.25
-+++ opie-console/emulation_handler.cpp 12 Oct 2005 21:05:47 -0000 1.26
-@@ -250,3 +250,6 @@
- m_teWid->setWrapAt(columns);
- }
-
-+void EmulationHandler::setScrollbarLocation(int index) {
-+ m_teWid->setScrollbarLocation(index);
-+}
-Index: emulation_handler.h
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -u -r1.8 -r1.9
---- opie-console/emulation_handler.h 8 Oct 2004 20:03:40 -0000 1.8
-+++ opie-console/emulation_handler.h 12 Oct 2005 21:05:47 -0000 1.9
-@@ -83,6 +83,7 @@
-
- /* Propagate change to widget */
- void setWrap(int columns);
-+ void setScrollbarLocation(int index);
- signals:
- void send( const QByteArray& );
- void changeSize(int rows, int cols );
-Index: mainwindow.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.cpp,v
-retrieving revision 1.94
-retrieving revision 1.95
-diff -u -u -r1.94 -r1.95
---- opie-console/mainwindow.cpp 16 May 2005 18:56:02 -0000 1.94
-+++ opie-console/mainwindow.cpp 12 Oct 2005 21:05:47 -0000 1.95
-@@ -69,6 +69,7 @@
- m_scripts = new QPopupMenu( this );
- m_sessionsPop= new QPopupMenu( this );
- m_scriptsPop = new QPopupMenu( this );
-+ m_scrollbar = new QPopupMenu( this );
-
- /* add a toolbar for icons */
- m_icons = new QToolBar(this);
-@@ -164,6 +165,17 @@
- connect( m_fullscreen, SIGNAL( activated() ),
- this, SLOT( slotFullscreen() ) );
-
-+ /*
-+ * scrollbar
-+ */
-+ sm_none = m_scrollbar->insertItem(tr( "None" ));
-+ sm_left = m_scrollbar->insertItem(tr( "Left" ));
-+ sm_right = m_scrollbar->insertItem(tr( "Right" ));
-+
-+ m_console->insertItem(tr("Scrollbar"), m_scrollbar, -1, 0);
-+ connect( m_scrollbar, SIGNAL(activated(int)),
-+ this, SLOT(slotScrollbarSelected(int)));
-+
- m_console->insertSeparator();
-
- m_recordLog = new QAction();
-@@ -693,6 +705,35 @@
- m_isFullscreen = !m_isFullscreen;
- }
-
-+void MainWindow::slotScrollbarSelected(int index)
-+{
-+ int loc;
-+
-+ Config cfg( "Konsole" );
-+ cfg.setGroup("ScrollBar");
-+ if(index == sm_none)
-+ {
-+ loc = 0;
-+ }
-+ else if(index == sm_left)
-+ {
-+ loc = 1;
-+ }
-+ else if(index == sm_right)
-+ {
-+ loc = 2;
-+ }
-+
-+ cfg.writeEntry("Position", loc);
-+
-+ if (currentSession()) {
-+ currentSession()->emulationHandler()->setScrollbarLocation(loc);
-+ }
-+
-+ m_scrollbar->setItemChecked(sm_none, index == sm_none);
-+ m_scrollbar->setItemChecked(sm_left, index == sm_left);
-+ m_scrollbar->setItemChecked(sm_right, index == sm_right);
-+}
-
- void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
-
-Index: mainwindow.h
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.h,v
-retrieving revision 1.29
-retrieving revision 1.30
-diff -u -u -r1.29 -r1.30
---- opie-console/mainwindow.h 8 Oct 2004 20:03:40 -0000 1.29
-+++ opie-console/mainwindow.h 12 Oct 2005 21:05:47 -0000 1.30
-@@ -24,6 +24,7 @@
- class FKey;
- class DocLnk;
-
-+
- class MainWindow : public QMainWindow {
- Q_OBJECT
- public:
-@@ -75,6 +76,7 @@
- void slotKeyReceived(FKey, ushort, ushort, bool);
- void slotSaveHistory();
- void slotSaveLog();
-+ void slotScrollbarSelected(int);
-
- /* what could these both slot do? */
- void slotCopy();
-@@ -105,6 +107,12 @@
- MetaFactory* m_factory;
- ProfileManager* m_manager;
-
-+ /*
-+ * scrollbar
-+ */
-+
-+ int sm_none, sm_left, sm_right;
-+
- TabWidget* m_consoleWindow;
- QToolBar* m_tool;
- QToolBar* m_icons;
-@@ -115,6 +123,7 @@
- QPopupMenu* m_sessionsPop;
- QPopupMenu* m_scriptsPop;
- QPopupMenu* m_scripts;
-+ QPopupMenu* m_scrollbar;
- QAction* m_connect;
- QAction* m_disconnect;
- QAction* m_quickLaunch;
diff --git a/packages/opie-console/opie-console_1.2.2.bb b/packages/opie-console/opie-console_1.2.2.bb
index 5dbdba0790..795e3fcb11 100644
--- a/packages/opie-console/opie-console_1.2.2.bb
+++ b/packages/opie-console/opie-console_1.2.2.bb
@@ -3,7 +3,4 @@ include ${PN}.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://1686-bugfix.patch;patch=1 \
- file://1647-bugfix.patch;patch=1 \
- file://0117_opie-console-use-default-fixed.diff;patch=1"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"