diff options
Diffstat (limited to 'packages')
6 files changed, 2 insertions, 213 deletions
diff --git a/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty b/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch b/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch deleted file mode 100644 index 27fc32bac3..0000000000 --- a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: appearance.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.cpp,v -retrieving revision 1.35 -retrieving revision 1.37 -diff -u -r1.35 -r1.37 ---- appearance2/appearance.cpp 9 Jun 2005 20:47:58 -0000 1.35 -+++ appearance2/appearance.cpp 26 Oct 2005 15:36:04 -0000 1.37 -@@ -394,6 +394,39 @@ - m_rotdir_ccw-> setChecked ( rot == CCW ); - m_rotdir_flip-> setChecked ( rot == Flip ); - -+ QFrame *f2 = new QFrame ( tab ); -+ f2-> setFrameStyle ( QFrame::HLine | QFrame::Sunken ); -+ vertLayout-> addWidget ( f2 ); -+ vertLayout-> addSpacing ( 3 ); -+ -+ QHBoxLayout *bigIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label2 = new QLabel( tr( "Big Icon size:" ), tab ); -+ bigIconlay-> addWidget ( label2, 0, 0 ); -+ -+ m_bigIconSize = new QSpinBox(0, 128, 1, tab); -+ m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize", AppLnk::bigIconSize() )); -+ bigIconlay->addWidget( m_bigIconSize ); -+ label2->setBuddy( m_bigIconSize ); -+ QWhatsThis::add( label2, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ QWhatsThis::add( m_bigIconSize, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ -+ QHBoxLayout *smallIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label3 = new QLabel( tr( "Small Icon size:" ), tab ); -+ smallIconlay-> addWidget ( label3, 0, 0 ); -+ -+ m_smallIconSize = new QSpinBox(0, 128, 1, tab); -+ m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize", AppLnk::smallIconSize() )); -+ smallIconlay->addWidget( m_smallIconSize ); -+ label3->setBuddy( m_smallIconSize ); -+ QWhatsThis::add( label3, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ QWhatsThis::add( m_smallIconSize, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ -+ m_useBigPixmaps = new QCheckBox( tr("use Big Pixmaps"), tab); -+ m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps", qApp->desktop()->width() > 320 )); -+ vertLayout->addWidget( m_useBigPixmaps ); -+ QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps, you probably want to enable this option for devices with screen resolution greater than 240x320" ) ); - - /* - * add a spacing -@@ -513,6 +546,10 @@ - - config. writeEntry( "LeftHand", m_leftHand->isChecked() ); - -+ config. writeEntry( "useBigPixmaps", m_useBigPixmaps->isChecked() ); -+ config. writeEntry( "BigIconSize", m_bigIconSize->value() ); -+ config. writeEntry( "SmallIconSize", m_smallIconSize->value() ); -+ - config. write ( ); // need to flush the config info first - Global::applyStyle ( ); - -Index: appearance.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.h,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -r1.13 -r1.14 ---- appearance2/appearance.h 5 Jun 2005 22:47:00 -0000 1.13 -+++ appearance2/appearance.h 17 Oct 2005 13:28:10 -0000 1.14 -@@ -37,6 +37,7 @@ - #include <qpe/fontdatabase.h> - - #include <qdialog.h> -+#include <qspinbox.h> - - using Opie::Ui::OFontSelector; - -@@ -123,6 +124,10 @@ - - QWidget * m_advtab; - QCheckBox *m_leftHand; -+ -+ QSpinBox *m_bigIconSize; -+ QSpinBox *m_smallIconSize; -+ QCheckBox *m_useBigPixmaps; - }; - - #endif diff --git a/packages/opie-appearance/opie-appearance_1.2.2.bb b/packages/opie-appearance/opie-appearance_1.2.2.bb index ee26b50ca6..7b154b7422 100644 --- a/packages/opie-appearance/opie-appearance_1.2.2.bb +++ b/packages/opie-appearance/opie-appearance_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://add-ui-settings.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty b/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff b/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff deleted file mode 100644 index 37b4b9bc13..0000000000 --- a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff +++ /dev/null @@ -1,123 +0,0 @@ -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v -retrieving revision 1.23 -diff -u -u -r1.23 oipkg.cpp ---- packagemanager/oipkg.cpp 5 Jun 2005 22:18:10 -0000 1.23 -+++ packagemanager/oipkg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -422,6 +422,8 @@ - m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); - // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); - m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); -+ m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); -+ m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); - m_ipkgArgs.verbosity = m_ipkgExecVerbosity; - if ( m_ipkgArgs.dest ) - free( m_ipkgArgs.dest ); -Index: oipkg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v -retrieving revision 1.8 -diff -u -u -r1.8 oipkg.h ---- packagemanager/oipkg.h 5 Jun 2005 22:18:10 -0000 1.8 -+++ packagemanager/oipkg.h 14 Jan 2006 12:10:24 -0000 -@@ -43,6 +43,8 @@ - #define FORCE_REMOVE 0x0002 - #define FORCE_REINSTALL 0x0004 - #define FORCE_OVERWRITE 0x0008 -+#define FORCE_RECURSIVE 0x0010 -+#define FORCE_VERBOSE_WGET 0x0020 - - class OConfItemList; - -Index: oipkgconfigdlg.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.cpp,v -retrieving revision 1.20 -diff -u -u -r1.20 oipkgconfigdlg.cpp ---- packagemanager/oipkgconfigdlg.cpp 5 Jun 2005 22:41:15 -0000 1.20 -+++ packagemanager/oipkgconfigdlg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -150,6 +150,10 @@ - options |= FORCE_REMOVE; - if ( m_optForceOverwrite->isChecked() ) - options |= FORCE_OVERWRITE; -+ if ( m_optForceRecursive->isChecked() ) -+ options |= FORCE_RECURSIVE; -+ if ( m_optVerboseWget->isChecked() ) -+ options |= FORCE_VERBOSE_WGET; - m_ipkg->setIpkgExecOptions( options ); - m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); - -@@ -336,9 +340,17 @@ - QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); - layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); - -+ m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); -+ QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); -+ -+ m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); -+ QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); -+ - QLabel *l = new QLabel( tr( "Information level:" ), container ); - QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); -- layout->addMultiCellWidget( l, 4, 4, 0, 1 ); -+ layout->addMultiCellWidget( l, 6, 6, 0, 1 ); - - m_optVerboseIpkg = new QComboBox( container ); - QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); -@@ -346,15 +358,15 @@ - m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); -- layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); -+ layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); - - l = new QLabel( tr( "Package source lists directory:" ), container ); - QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addMultiCellWidget( l, 6, 6, 0, 1 ); -+ layout->addMultiCellWidget( l, 8, 8, 0, 1 ); - - m_optSourceLists = new QLineEdit( container ); - QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addWidget( m_optSourceLists, 7, 0 ); -+ layout->addWidget( m_optSourceLists, 9, 0 ); - - QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), - QString::null, container ); -@@ -362,7 +374,7 @@ - btn->setMaximumWidth( btn->height() ); - QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); - connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); -- layout->addWidget( btn, 7, 1 ); -+ layout->addWidget( btn, 9, 1 ); - - layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - } -@@ -433,6 +445,10 @@ - m_optForceRemove->setChecked( true ); - if ( options & FORCE_OVERWRITE ) - m_optForceOverwrite->setChecked( true ); -+ if ( options & FORCE_RECURSIVE ) -+ m_optForceRecursive->setChecked( true ); -+ if ( options & FORCE_VERBOSE_WGET ) -+ m_optVerboseWget->setChecked( true ); - - m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); - } -Index: oipkgconfigdlg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.h,v -retrieving revision 1.10 -diff -u -u -r1.10 oipkgconfigdlg.h ---- packagemanager/oipkgconfigdlg.h 5 Jun 2005 22:18:10 -0000 1.10 -+++ packagemanager/oipkgconfigdlg.h 14 Jan 2006 12:10:24 -0000 -@@ -96,6 +96,8 @@ - QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox - QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox - QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox -+ QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox -+ QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox - QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection - QLineEdit *m_optSourceLists; // Ipkg source lists destination directory - diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb index 4e032baf63..385ca61fdb 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" |