summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-04 22:35:57 (UTC)
committer zecke <zecke>2004-04-04 22:35:57 (UTC)
commitae71ba19e1e7a207e2e1720a13eec4aaddf4e2c2 (patch) (side-by-side diff)
treebb20dd20b3a5d7e2c0ed0ca98f83530dfee1ed51
parentfad3886132f81ff5f1f84c09e9a0b3048d91296d (diff)
downloadopie-ae71ba19e1e7a207e2e1720a13eec4aaddf4e2c2.zip
opie-ae71ba19e1e7a207e2e1720a13eec4aaddf4e2c2.tar.gz
opie-ae71ba19e1e7a207e2e1720a13eec4aaddf4e2c2.tar.bz2
fix with odebug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/tabmanager/tabmanager.cpp122
-rw-r--r--noncore/settings/tabmanager/tabmanager.pro2
2 files changed, 63 insertions, 61 deletions
diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp
index 4274203..3eae424 100644
--- a/noncore/settings/tabmanager/tabmanager.cpp
+++ b/noncore/settings/tabmanager/tabmanager.cpp
@@ -4,4 +4,6 @@
#include "tabapplnk.h"
+#include <opie2/odebug.h>
+
#include <qpe/applnk.h>
#include <qdir.h>
@@ -64,6 +66,6 @@ TabManager::~TabManager(){
*/
void TabManager::rescanFolder(QString directory, QListViewItem* parent){
- //odebug << QString("rescanFolder: ") + directory.latin1() << oendl;
-
+ //odebug << QString("rescanFolder: ") + directory.latin1() << oendl;
+
QDir d;
d.setPath(directory);
@@ -90,5 +92,5 @@ void TabManager::rescanFolder(QString directory, QListViewItem* parent){
else{
// it is a file, if not a .directory add to parent.
-
+
// Change parents name and icon to reflect icon.
if(fi->fileName() == ".directory"){
@@ -130,9 +132,9 @@ void TabManager::newFolder(){
system((QString("echo [Desktop Entry] | cat >> ") + HOME_APP_DIR + "/" + NEW_FOLDER "/.directory").latin1());
system((QString("echo Name=" NEW_FOLDER " | cat >> ") + HOME_APP_DIR + "/" + NEW_FOLDER "/.directory").latin1());
-
+
QString homeLocation = QString(HOME_APP_DIR) + "/" + NEW_FOLDER + "/.directory";
QListViewItem *newItem = new QListViewItem(tabList, NEW_FOLDER);
itemList.insert(newItem, homeLocation );
-
+
// We have changed something.
changed = true;
@@ -149,6 +151,6 @@ void TabManager::newApplication(){
if(!item || item->parent())
return;
-
- QString parentDir = itemList[item].mid(0,itemList[item].length()-11);
+
+ QString parentDir = itemList[item].mid(0,itemList[item].length()-11);
QString homeLocation = parentDir + "/" NEW_APPLICATION APPLICATION_EXTENSION;
system((QString("echo [Desktop Entry] | cat >> ") + homeLocation).latin1());
@@ -156,11 +158,11 @@ void TabManager::newApplication(){
int slash = parentDir.findRev('/', -1);
QString folderName = parentDir.mid(slash+1, parentDir.length());
-
+
system((QString("echo Type=") + folderName + " | cat >> " + homeLocation).latin1());
-
+
// Insert into the tree
QListViewItem *newItem = new QListViewItem(item, NEW_APPLICATION);
itemList.insert(newItem, homeLocation );
-
+
// We have changed something.
changed = true;
@@ -173,5 +175,5 @@ void TabManager::newApplication(){
* Delete physical file (Dir, remove .dir, then dir. File, remove file)
* Remove from installer if need too.
- */
+ */
void TabManager::removeItem(){
// Make sure we can delete
@@ -181,12 +183,12 @@ void TabManager::removeItem(){
if(item->childCount() > 0){
QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), tr("Ok") );
- return;
+ return;
}
-
+
// Prompt.
int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"), tr("Yes"), tr("Cancel"), 0, 1 );
if (answer)
return;
-
+
bool removeSuccessful = true;
QString location = itemList[item];
@@ -194,5 +196,5 @@ void TabManager::removeItem(){
if(!QFile::remove(location))
removeSuccessful = false;
-
+
// Remove directory
if(item->parent() == NULL){
@@ -205,15 +207,15 @@ void TabManager::removeItem(){
removeSuccessful = true;
}
-
- // If removing failed.
+
+ // If removing failed.
if(!removeSuccessful){
- odebug << (QString("removeItem: ") + location).latin1() << oendl;
+ odebug << (QString("removeItem: ") + location).latin1() << oendl;
QMessageBox::critical(this, tr("Message"), tr("Can't remove."), tr("Ok") );
return;
}
-
+
// Remove from the installer so it wont fail.
// Don't need to do this sense the current install uses rm -f so no error
-
+
// Remove from the gui list.
itemList.remove(item);
@@ -221,5 +223,5 @@ void TabManager::removeItem(){
item->parent()->takeItem(item);
delete item;
-
+
// We have changed something.
changed = true;
@@ -236,17 +238,17 @@ void TabManager::editCurrentItem(){
/**
* Edit the item that is passed in.
- * Show application dialog and if anything changed
+ * Show application dialog and if anything changed
* @param item the item to edit.
- */
+ */
void TabManager::editItem( QListViewItem * item){
if(!item)
return;
-
+
TabAppLnk app(itemList[item]);
if(!app.isValid()){
- odebug << QString("editItem: Not a valid applnk file: ") + itemList[item].latin1() << oendl;
- return;
- }
-
+ odebug << QString("editItem: Not a valid applnk file: ") + itemList[item].latin1() << oendl;
+ return;
+ }
+
// Fill with all of the icons
if(!application){
@@ -256,5 +258,5 @@ void TabManager::editItem( QListViewItem * item){
qApp->processEvents();
application = new AppEdit(this, "Application edit", true);
-
+
QDir d(QPEApplication::qpeDir() + "/pics/");
d.setFilter( QDir::Files);
@@ -272,7 +274,7 @@ void TabManager::editItem( QListViewItem * item){
foo = foo.smoothScale(16,16);
imageOfFile.convertFromImage(foo);
- application->iconLineEdit->insertItem(imageOfFile,fileName);
+ application->iconLineEdit->insertItem(imageOfFile,fileName);
}
- //odebug << fi->fileName().latin1() << oendl;
+ //odebug << fi->fileName().latin1() << oendl;
++it;
}
@@ -298,12 +300,12 @@ void TabManager::editItem( QListViewItem * item){
foo = foo.smoothScale(16,16);
imageOfFile.convertFromImage(foo);
- application->iconLineEdit->insertItem(imageOfFile,pixmapText,0);
+ application->iconLineEdit->insertItem(imageOfFile,pixmapText,0);
application->iconLineEdit->setCurrentItem(0);
}
-
+
application->nameLineEdit->setText(app.name());
application->execLineEdit->setText(app.exec());
application->commentLineEdit->setText(app.comment());
-
+
if(item->parent() == NULL){
application->execLineEdit->setEnabled(false);
@@ -316,5 +318,5 @@ void TabManager::editItem( QListViewItem * item){
application->setCaption(tr("Application"));
}
-
+
// Only do somthing if they hit OK
application->showMaximized();
@@ -339,12 +341,12 @@ void TabManager::editItem( QListViewItem * item){
return;
}
-
+
// Update the gui icon and name
item->setText(0,app.name());
item->setPixmap(0,app.pixmap());
-
+
// We have changed something.
changed = true;
-
+
// If we were dealing with a new folder or new application change
// the file names. Also change the item location in itemList
@@ -372,5 +374,5 @@ void TabManager::editItem( QListViewItem * item){
}
}
-
+
/**
* Move an application from one directory to another.
@@ -378,18 +380,18 @@ void TabManager::editItem( QListViewItem * item){
* @param item the application to move
* @pearam newGroup the new parent of this application
- */
+ */
void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){
// Can we even move it?
if(!item || !item->parent() || newGroup->parent())
- return;
+ return;
if(item->parent() == newGroup)
return;
- // Get the new folder, new file name,
+ // Get the new folder, new file name,
QString newFolder = itemList[newGroup];
newFolder = newFolder.mid(0,newFolder.length()-11);
int slash = newFolder.findRev('/', -1);
QString folderName = newFolder.mid(slash+1, newFolder.length());
-
+
QString desktopFile = itemList[item];
slash = desktopFile.findRev('/', -1);
@@ -401,14 +403,14 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){
if(!r.rename(itemList[item], newFolder)){
QMessageBox::critical(this, tr("Message"), "Can't move application.", tr("Ok") );
- return;
+ return;
}
- //odebug << (QString("moveApplication: ") + itemList[item]).latin1() << oendl;
- //odebug << (QString("moveApplication: ") + newFolder).latin1() << oendl;
-
+ //odebug << (QString("moveApplication: ") + itemList[item]).latin1() << oendl;
+ //odebug << (QString("moveApplication: ") + newFolder).latin1() << oendl;
+
// Move in the gui
item->parent()->takeItem(item);
newGroup->insertItem(item);
newGroup->setOpen(true);
-
+
// Move file in the installer
QString installedAppFile;
@@ -416,15 +418,15 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){
swapInstalledLocation(installedAppFile, desktopFile, newFolder);
else
- odebug << "moveApplication: No installed app found for dekstop file" << oendl;
-
- // Move application type
+ odebug << "moveApplication: No installed app found for dekstop file" << oendl;
+
+ // Move application type
AppLnk app(newFolder);
app.setType(folderName);
app.writeLink();
-
+
// Move in our internal list
itemList.remove(item);
itemList.insert(item, newFolder);
-
+
// We have changed something.
changed = true;
@@ -438,7 +440,7 @@ void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){
* @param installedAppFile - location of the app install list
* @return true if successful, false if file not found.
- */
+ */
bool TabManager::findInstalledApplication(QString desktopFile, QString &installedAppFile){
-
+
QDir d;
d.setPath(HOME_APP_INSTALL_DIR);
@@ -465,5 +467,5 @@ bool TabManager::findInstalledApplication(QString desktopFile, QString &installe
}
else
- odebug << (QString("findInstalledApplication: Can't open file") + HOME_APP_INSTALL_DIR + "/" + fi->fileName()).latin1() << oendl;
+ odebug << (QString("findInstalledApplication: Can't open file") + HOME_APP_INSTALL_DIR + "/" + fi->fileName()).latin1() << oendl;
++it; // goto next list element
}
@@ -474,5 +476,5 @@ bool TabManager::findInstalledApplication(QString desktopFile, QString &installe
* Open a file and replace a file containing the old desktop file with the new.
* @param installedAppFile application installed list
- * @param desktopFile old .desktop file
+ * @param desktopFile old .desktop file
* @param newLocation new .desktop file
*/
@@ -480,8 +482,8 @@ void TabManager::swapInstalledLocation( QString installedAppFile, QString deskto
QFile file(installedAppFile);
if ( !file.open(IO_ReadOnly) ){
- odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl;
+ odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl;
return;
}
-
+
QTextStream stream( &file ); // use a text stream
QString allLines;
@@ -497,5 +499,5 @@ void TabManager::swapInstalledLocation( QString installedAppFile, QString deskto
if ( !file.open(IO_ReadWrite) ){
- odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl;
+ odebug << QString("swapInstalledLocation: Can't edit file: %1").arg(installedAppFile).latin1() << oendl;
return;
}
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index dbc81a3..d4aac43 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -5,5 +5,5 @@ SOURCES = main.cpp tabmanager.cpp tabmanagerbase.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
INTERFACES = app.ui wait.ui
TARGET = tabmanager