[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    PATCH: non-kde icons in kicker
From:       David Smith <dsmith () algonet ! se>
Date:       2001-02-02 22:40:24
[Download RAW message or body]

With this patch kicker does not strip the path to non-kde icons
in buttons, so they are displayed properly.

There were some bug reports about this already. Some of them
were marked as done, so maybe this would be fixed soon anyway.
Otherwise, can this be commited?

/David
["addcontainer_mnu.cpp.diff" (text/plain)]

Index: ui/addcontainer_mnu.cpp
===================================================================
RCS file: /home/kde/kdebase/kicker/ui/addcontainer_mnu.cpp,v
retrieving revision 1.1
diff -u -r1.1 addcontainer_mnu.cpp
--- ui/addcontainer_mnu.cpp	2000/10/29 12:54:04	1.1
+++ ui/addcontainer_mnu.cpp	2001/02/02 22:22:05
@@ -112,10 +112,7 @@
 
     PanelExeDialog dlg(exec, pixmapFile, QString::null, false, 0);
 
-    if(dlg.exec() == QDialog::Accepted)	{
-	// KIconloader returns a full path, we only want name
-	QFileInfo iconfi(dlg.icon());
-	if (containerArea)
-	    containerArea->addExeButton(exec, iconfi.fileName(), dlg.commandLine(), dlg.useTerminal());
-    }
+    if(dlg.exec() == QDialog::Accepted)
+		if (containerArea)
+			containerArea->addExeButton(exec, dlg.icon(), dlg.commandLine(), dlg.useTerminal());
 }

["panelbutton.cpp.diff" (text/plain)]

Index: core/panelbutton.cpp
===================================================================
RCS file: /home/kde/kdebase/kicker/core/panelbutton.cpp,v
retrieving revision 1.21
diff -u -r1.21 panelbutton.cpp
--- core/panelbutton.cpp	2001/01/22 09:53:20	1.21
+++ core/panelbutton.cpp	2001/02/02 22:21:34
@@ -702,10 +702,8 @@
 {
   PanelExeDialog dlg(pathStr, iconStr, cmdStr, term, this);
   if(dlg.exec() == QDialog::Accepted){
-    // KIconloader returns a full path, we only want name
-    QFileInfo iconfi(dlg.icon());
-    iconStr = iconfi.baseName();
-    cmdStr = dlg.commandLine();
+	iconStr = dlg.icon();
+	cmdStr = dlg.commandLine();
     term = dlg.useTerminal();
     setIcon(iconStr, "exec");
     emit requestSave();

>> Visit http://master.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]