Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(98) |
Sep
(138) |
Oct
(100) |
Nov
(49) |
Dec
(131) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(94) |
Feb
(65) |
Mar
(100) |
Apr
(83) |
May
(72) |
Jun
(29) |
Jul
(167) |
Aug
(127) |
Sep
(131) |
Oct
(269) |
Nov
(122) |
Dec
(100) |
| 2005 |
Jan
(228) |
Feb
(266) |
Mar
(63) |
Apr
(135) |
May
(157) |
Jun
(52) |
Jul
(25) |
Aug
(49) |
Sep
(184) |
Oct
(159) |
Nov
(75) |
Dec
(37) |
| 2006 |
Jan
(60) |
Feb
(129) |
Mar
(110) |
Apr
(34) |
May
(31) |
Jun
(42) |
Jul
(72) |
Aug
(90) |
Sep
(57) |
Oct
(66) |
Nov
(42) |
Dec
(90) |
| 2007 |
Jan
(106) |
Feb
(54) |
Mar
(93) |
Apr
(27) |
May
(21) |
Jun
(17) |
Jul
(19) |
Aug
(22) |
Sep
(25) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2008 |
Jan
(65) |
Feb
(70) |
Mar
(29) |
Apr
(45) |
May
(91) |
Jun
(20) |
Jul
(11) |
Aug
(24) |
Sep
(23) |
Oct
(13) |
Nov
(23) |
Dec
(39) |
| 2009 |
Jan
(23) |
Feb
(39) |
Mar
(15) |
Apr
(56) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Karai C. <ck...@us...> - 2004-04-17 20:18:45
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7396/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: FIXED: KDE 3.2, the panels are right justified Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** panelmanager.cpp 15 Apr 2004 06:33:58 -0000 1.8 --- panelmanager.cpp 17 Apr 2004 20:18:36 -0000 1.9 *************** *** 42,49 **** connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 ); ! _layout->addWidget( _newTab, 1, 0 ); ! _layout->addWidget( _tabbar, 1, 1 ); ! _layout->addWidget( _closeTab, 1, 2 ); if (HIDE_ON_SINGLE_TAB) HIDE --- 42,57 ---- connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! #if QT_VERSION >= 0x030300 ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 3 ); // KDE 3.2 bug the tab widget ! _layout->addWidget( _newTab, 1, 0 ); // is left justified. A spacer is ! _layout->addWidget( _tabbar, 1, 1 ); // inserted to solve the problem. ! _layout->addItem( new QSpacerItem( 0,0, QSizePolicy::Expanding, QSizePolicy::Minimum), 1, 2 ); ! _layout->addWidget( _closeTab, 1, 3 ); ! #else ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 ); // KDE 3.1.1 bug the spacer cannot be ! _layout->addWidget( _newTab, 1, 0 ); // inserted because it shrinks the tab ! _layout->addWidget( _tabbar, 1, 1 ); // widget into half size, which is ugly. ! _layout->addWidget( _closeTab, 1, 2 ); // Does anybody know a universal solution? ! #endif if (HIDE_ON_SINGLE_TAB) HIDE |
|
From: Karai C. <ck...@us...> - 2004-04-17 20:18:45
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7396/krusader_kde3 Modified Files: ChangeLog Log Message: FIXED: KDE 3.2, the panels are right justified Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.205 retrieving revision 1.206 diff -C2 -d -r1.205 -r1.206 *** ChangeLog 16 Apr 2004 21:19:24 -0000 1.205 --- ChangeLog 17 Apr 2004 20:18:36 -0000 1.206 *************** *** 1,2 **** --- 1,3 ---- + FIXED: KDE 3.2, right justified tabs bug FIXED: dragging over a new tab changes active tab FIXED: crash at pressing space on the '..' directory |
|
From: Dirk E. <des...@us...> - 2004-04-17 14:02:11
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2916/po Modified Files: de.po Log Message: Index: de.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** de.po 16 Apr 2004 23:34:54 -0000 1.7 --- de.po 17 Apr 2004 14:02:01 -0000 1.8 *************** *** 1,9 **** ! # translation of de.po to ! # translation of de.po to ! # translation of de.po to ! # translation of de.po to # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # Christoph Thielecke <cri...@gm...>, 2003. ! # Dirk Eschler <des...@us...>, 2003, 2004. # msgid "" --- 1,7 ---- ! # translation of de.po to german ! # translation of krusader.pot to german # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # Christoph Thielecke <cri...@gm...>, 2003. ! # Dirk Eschler <des...@us...>, 2003, 2004. # msgid "" *************** *** 12,18 **** "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-29 20:37+0000\n" ! "PO-Revision-Date: 2004-04-17 01:32+0200\n" ! "Last-Translator: Dirk Eschler <des...@us...>\n" ! "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" --- 10,16 ---- "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-29 20:37+0000\n" ! "PO-Revision-Date: 2004-04-17 15:59+0200\n" ! "Last-Translator: Dirk Eschler <des...@us...>\n" ! "Language-Team: german\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" *************** *** 22,26 **** #: Locate/locate.cpp:64 msgid "Update DB" ! msgstr "Update DB" #: Locate/locate.cpp:64 Locate/locate.cpp:266 --- 20,24 ---- #: Locate/locate.cpp:64 msgid "Update DB" ! msgstr "Aktualisiere DB" #: Locate/locate.cpp:64 Locate/locate.cpp:266 *************** *** 176,180 **** #: Splitter/splittergui.cpp:79 msgid "Max file size:" ! msgstr "Maximale DateigröÃe" #: Splitter/splittergui.cpp:86 --- 174,178 ---- #: Splitter/splittergui.cpp:79 msgid "Max file size:" ! msgstr "Maximale DateigröÃe:" #: Splitter/splittergui.cpp:86 *************** *** 889,894 **** "to your path. Hint: Krusader supports kdiff and xxdiff." msgstr "" ! "Krusader konnte keines von den unterstützten dfiff Frontends finden. Bitte " ! "installieren Sie eines in Ihrem Pfad. Tip: Krusader unterstützt kdiff und " "xxdiff." --- 887,892 ---- "to your path. Hint: Krusader supports kdiff and xxdiff." msgstr "" ! "Krusader konnte keines der unterstützten dfiff Frontends finden. Bitte " ! "installieren Sie eines in Ihrem Pfad. Tipp: Krusader unterstützt kdiff und " "xxdiff." *************** *** 1098,1102 **** #: GUI/kcmdline.cpp:60 msgid "Name of directory where command will be processed." ! msgstr "Verzeichnisname in dem das Kommando ausgeführt wird." #: GUI/kcmdline.cpp:89 --- 1096,1100 ---- #: GUI/kcmdline.cpp:60 msgid "Name of directory where command will be processed." ! msgstr "Verzeichnisname in dem der Befehl ausgeführt wird." #: GUI/kcmdline.cpp:89 *************** *** 1106,1116 **** "Down> arrows.</qt>" msgstr "" ! "<qt>Es ist wirklich einfach: Sie geben hier ein Kommando ein und Krusader führt " ! "es aus.<p><Tip:>Einfügen der Kommandozeilen-Verlauf mit den <Bild-Hoch> und <" "Bild-Runter>-Tasten.</qt>" #: GUI/kcmdline.cpp:98 msgid "If pressed, Krusader executes command line in a terminal." ! msgstr "Drücken und Krusader führt das Kommando in einem Terminal aus" #: GUI/kcmdline.cpp:104 --- 1104,1114 ---- "Down> arrows.</qt>" msgstr "" ! "<qt>Es ist wirklich einfach: Sie geben hier einen Befehl ein und Krusader führt " ! "ihn aus.<p><Tip:>Einfügen des Befehlszeilen-Verlaufs mit den <Bild-Hoch> und <" "Bild-Runter>-Tasten.</qt>" #: GUI/kcmdline.cpp:98 msgid "If pressed, Krusader executes command line in a terminal." ! msgstr "Drücken und Krusader führt den Befehl in einem Terminal aus" #: GUI/kcmdline.cpp:104 *************** *** 1324,1328 **** #: UserMenu/usermenuaddimpl.cpp:56 msgid "Command line is empty" ! msgstr "Die Kommandozeile ist leer" #: UserMenu/usermenu.cpp:56 --- 1322,1326 ---- #: UserMenu/usermenuaddimpl.cpp:56 msgid "Command line is empty" ! msgstr "Die Befehlszeile ist leer" #: UserMenu/usermenu.cpp:56 *************** *** 1400,1412 **** #: UserMenu/usermenuadd.cpp:201 msgid "everywhere" ! msgstr "überall" #: UserMenu/usermenuadd.cpp:202 msgid "only in" ! msgstr "nur in" #: UserMenu/usermenuadd.cpp:204 msgid "Command accepts" ! msgstr "Kommando akzeptiert" #: UserMenu/usermenuadd.cpp:205 --- 1398,1410 ---- #: UserMenu/usermenuadd.cpp:201 msgid "everywhere" ! msgstr "Ãberall" #: UserMenu/usermenuadd.cpp:202 msgid "only in" ! msgstr "Nur in" #: UserMenu/usermenuadd.cpp:204 msgid "Command accepts" ! msgstr "Befehl akzeptiert" #: UserMenu/usermenuadd.cpp:205 *************** *** 1440,1444 **** #: UserMenu/usermenuadd.cpp:213 msgid "Command line" ! msgstr "Kommandozeile" #: UserMenu/usermenuadd.cpp:215 Dialogs/packguibase.cpp:487 --- 1438,1442 ---- #: UserMenu/usermenuadd.cpp:213 msgid "Command line" ! msgstr "Befehlszeile" #: UserMenu/usermenuadd.cpp:215 Dialogs/packguibase.cpp:487 *************** *** 1885,1894 **** #: Konfigurator/kgstartup.cpp:114 msgid "homepage" ! msgstr "Homepage" #: Panel/listpanel.cpp:353 Panel/listpanel.cpp:360 #: Konfigurator/kgstartup.cpp:60 krusader.cpp:526 krusader.cpp:529 msgid "the last place it was" ! msgstr "Der letzte Ort der war" #: Panel/listpanel.cpp:417 --- 1883,1892 ---- #: Konfigurator/kgstartup.cpp:114 msgid "homepage" ! msgstr "Startseite" #: Panel/listpanel.cpp:353 Panel/listpanel.cpp:360 #: Konfigurator/kgstartup.cpp:60 krusader.cpp:526 krusader.cpp:529 msgid "the last place it was" ! msgstr "Ort an dem es zuletzt war" #: Panel/listpanel.cpp:417 *************** *** 2283,2287 **** #: Konfigurator/kglookfeel.cpp:67 msgid "Case sensitive quicksearch" ! msgstr "GroÃ-/Kleinschreibung Schnellsuche" #: Konfigurator/kglookfeel.cpp:76 --- 2281,2285 ---- #: Konfigurator/kglookfeel.cpp:67 msgid "Case sensitive quicksearch" ! msgstr "Schnellsuche nach GroÃ-/Kleinschreibung" #: Konfigurator/kglookfeel.cpp:76 *************** *** 2295,2303 **** #: Konfigurator/kglookfeel.cpp:81 msgid "Left mouse button selects" ! msgstr "Linke Maustaste markiert" #: Konfigurator/kglookfeel.cpp:82 msgid "Right button selects (Windows Commander style)" ! msgstr "Rechte Maustaste markiert (Windows Commander Stil)" #: Konfigurator/kglookfeel.cpp:93 paneltabbar.cpp:32 --- 2293,2301 ---- #: Konfigurator/kglookfeel.cpp:81 msgid "Left mouse button selects" ! msgstr "Linke Maustaste wählt aus" #: Konfigurator/kglookfeel.cpp:82 msgid "Right button selects (Windows Commander style)" ! msgstr "Rechte Maustaste wählt aus (Windows Commander Stil)" #: Konfigurator/kglookfeel.cpp:93 paneltabbar.cpp:32 *************** *** 2399,2403 **** #: Konfigurator/kglookfeel.cpp:196 msgid "Up button (..) visible" ! msgstr "Hoch Knopf (..) sichtbar" #: Konfigurator/kglookfeel.cpp:197 --- 2397,2401 ---- #: Konfigurator/kglookfeel.cpp:196 msgid "Up button (..) visible" ! msgstr "Ebene Hoch Knopf (..) sichtbar" #: Konfigurator/kglookfeel.cpp:197 *************** *** 2423,2453 **** #: Konfigurator/kgadvanced.cpp:67 msgid "Krusader will request user confirmation for the following operations:" ! msgstr "" ! "Krusader wird für die folgenden Operatioen den Benutzter um Bestätigung " ! "fragen:" #: Konfigurator/kgadvanced.cpp:72 msgid "Deleting non-empty directorie(s)" ! msgstr "Löschen nichtleerer Verzeichnisse" #: Konfigurator/kgadvanced.cpp:73 msgid "Deleting file(s)" ! msgstr "Löschen von Datei(en)" #: Konfigurator/kgadvanced.cpp:74 msgid "Copying file(s)" ! msgstr "Kopieren von Datei(en)" #: Konfigurator/kgadvanced.cpp:75 msgid "Moving file(s)" ! msgstr "Verschieben von Datei(en)" #: Konfigurator/kgadvanced.cpp:86 Konfigurator/kgarchives.cpp:87 msgid "Fine-Tuning" ! msgstr "Feintuning" #: Konfigurator/kgadvanced.cpp:90 msgid "Icon cache size (KB):" ! msgstr "Symbol CachegröÃe (KB):" #: Konfigurator/kgadvanced.cpp:91 Konfigurator/kgadvanced.cpp:95 --- 2421,2449 ---- #: Konfigurator/kgadvanced.cpp:67 msgid "Krusader will request user confirmation for the following operations:" ! msgstr "Krusader wird den Benutzer für die folgenden Operationen um Bestätigung bitten:" #: Konfigurator/kgadvanced.cpp:72 msgid "Deleting non-empty directorie(s)" ! msgstr "Löschen nicht-leerer Verzeichnisse" #: Konfigurator/kgadvanced.cpp:73 msgid "Deleting file(s)" ! msgstr "Löschen von Dateien" #: Konfigurator/kgadvanced.cpp:74 msgid "Copying file(s)" ! msgstr "Kopieren von Dateien" #: Konfigurator/kgadvanced.cpp:75 msgid "Moving file(s)" ! msgstr "Verschieben von Dateien" #: Konfigurator/kgadvanced.cpp:86 Konfigurator/kgarchives.cpp:87 msgid "Fine-Tuning" ! msgstr "Feineinstellungen" #: Konfigurator/kgadvanced.cpp:90 msgid "Icon cache size (KB):" ! msgstr "GröÃe des Symbol-Zwischenspeichers (KB):" #: Konfigurator/kgadvanced.cpp:91 Konfigurator/kgadvanced.cpp:95 *************** *** 2456,2461 **** "However too big a cache might consume your memory." msgstr "" ! "Die CachegröÃe bestimmt, wie schnell Krusader den Inhalt einer Seite " ! "darstellen kann. Eine zu groÃe CachegröÃe kann möglicherweise Ihren Speicher " "belegen." --- 2452,2457 ---- "However too big a cache might consume your memory." msgstr "" ! "Die GröÃe des Zwischenspeichers bestimmt, wie schnell Krusader den Inhalt einer Seite " ! "darstellen kann. Ein zu groÃer Zwischenspeicher kann möglicherweise Ihren Speicher " "belegen." *************** *** 2542,2546 **** #: Konfigurator/kgarchives.cpp:61 msgid "Tar" ! msgstr "TAR" #: Konfigurator/kgarchives.cpp:62 --- 2538,2542 ---- #: Konfigurator/kgarchives.cpp:61 msgid "Tar" ! msgstr "Tar" #: Konfigurator/kgarchives.cpp:62 *************** *** 2554,2574 **** #: Konfigurator/kgarchives.cpp:64 msgid "Zip" ! msgstr "ZIP" #: Konfigurator/kgarchives.cpp:65 msgid "Rar" ! msgstr "RAR" #: Konfigurator/kgarchives.cpp:66 msgid "Arj" ! msgstr "ARJ" #: Konfigurator/kgarchives.cpp:67 msgid "Rpm" ! msgstr "RPM" #: Konfigurator/kgarchives.cpp:68 msgid "Ace" ! msgstr "ACE" #: Konfigurator/kgarchives.cpp:73 --- 2550,2570 ---- #: Konfigurator/kgarchives.cpp:64 msgid "Zip" ! msgstr "Zip" #: Konfigurator/kgarchives.cpp:65 msgid "Rar" ! msgstr "Rar" #: Konfigurator/kgarchives.cpp:66 msgid "Arj" ! msgstr "Arj" #: Konfigurator/kgarchives.cpp:67 msgid "Rpm" ! msgstr "Rpm" #: Konfigurator/kgarchives.cpp:68 msgid "Ace" ! msgstr "Ace" #: Konfigurator/kgarchives.cpp:73 *************** *** 2578,2585 **** "search again, click the 'Auto Configure' button." msgstr "" ! "Die Archive, die \"ausgegraut\" sind, waren nicht auf Ihrem \n" ! "System verfügbar, als Krusader es geprüft hat. Wenn Sie möchten, daà " ! "Krusader\n" ! " erneut sucht, klicken Sie den 'Automatische Konfiguration' Knopf." #: Konfigurator/kgarchives.cpp:78 --- 2574,2580 ---- "search again, click the 'Auto Configure' button." msgstr "" ! "Die Archive, die \"ausgegraut\" sind, waren nicht auf Ihrem System verfügbar\n" ! "als Krusader es das letzte Malgeprüft hat. Wenn Sie möchten, daà Krusader erneut sucht,\n" ! "klicken Sie den 'Automatische Konfiguration'-Knopf." #: Konfigurator/kgarchives.cpp:78 *************** *** 2602,2606 **** #: Konfigurator/kgarchives.cpp:93 msgid "Test archive when finished packing" ! msgstr "Archiv testen, wenn packen abgeschlossen" #: Konfigurator/kgarchives.cpp:93 --- 2597,2601 ---- #: Konfigurator/kgarchives.cpp:93 msgid "Test archive when finished packing" ! msgstr "Archiv testen, wenn das Packen abgeschlossen ist" #: Konfigurator/kgarchives.cpp:93 *************** *** 2610,2614 **** #: Konfigurator/kgarchives.cpp:94 msgid "Test archive before unpacking" ! msgstr "Archive vor dem Entpacken testen" #: Konfigurator/kgarchives.cpp:94 --- 2605,2609 ---- #: Konfigurator/kgarchives.cpp:94 msgid "Test archive before unpacking" ! msgstr "Archiv vor dem Entpacken testen" #: Konfigurator/kgarchives.cpp:94 *************** *** 2621,2625 **** "\n" msgstr "" ! "Suchergebenisse:\n" "\n" --- 2616,2620 ---- "\n" msgstr "" ! "Suchergebnisse:\n" "\n" *************** *** 2758,2762 **** msgstr "" "\n" ! "Wenn Sie neue Packer installieren, bitte installieren Sie" #: Konfigurator/kgarchives.cpp:135 Konfigurator/kggeneral.cpp:131 --- 2753,2757 ---- msgstr "" "\n" ! "Wenn Sie neue Packer installieren, dann bitte" #: Konfigurator/kgarchives.cpp:135 Konfigurator/kggeneral.cpp:131 *************** *** 2766,2770 **** msgstr "" "\n" ! "diese in Ihrem Pfad (z.B. /usr/bin, /usr/local/bin etc.)" #: Konfigurator/kgarchives.cpp:136 --- 2761,2765 ---- msgstr "" "\n" ! "in Ihrem Pfad (z.B. /usr/bin, /usr/local/bin, etc.)" #: Konfigurator/kgarchives.cpp:136 *************** *** 2774,2778 **** msgstr "" "\n" ! "Danke für das Testen von Krusader :-)" #: Konfigurator/konfigurator.cpp:58 --- 2769,2773 ---- msgstr "" "\n" ! "Danke das Sie mit Krusader geflogen sind :-)" #: Konfigurator/konfigurator.cpp:58 *************** *** 2831,2844 **** #: Konfigurator/kgstartup.cpp:45 msgid "Panels" ! msgstr "Seiten" #: Konfigurator/kgstartup.cpp:49 Konfigurator/kgstartup.cpp:93 msgid "Save settings on exit" ! msgstr "Einstellungen beim Verlassen speichern" #: Konfigurator/kgstartup.cpp:50 Konfigurator/kgstartup.cpp:55 #: Konfigurator/kgstartup.cpp:112 msgid "Start with the following settings:" ! msgstr "Start mit den folgenden Einstellungen:" #: Konfigurator/kgstartup.cpp:59 --- 2826,2839 ---- #: Konfigurator/kgstartup.cpp:45 msgid "Panels" ! msgstr "Dateifenster" #: Konfigurator/kgstartup.cpp:49 Konfigurator/kgstartup.cpp:93 msgid "Save settings on exit" ! msgstr "Einstellungen beim Beenden speichern" #: Konfigurator/kgstartup.cpp:50 Konfigurator/kgstartup.cpp:55 #: Konfigurator/kgstartup.cpp:112 msgid "Start with the following settings:" ! msgstr "Mit den folgenden Einstellungen starten:" #: Konfigurator/kgstartup.cpp:59 *************** *** 2852,2856 **** #: Konfigurator/kgstartup.cpp:68 Konfigurator/kgstartup.cpp:79 msgid "Homepage:" ! msgstr "Homepage:" #: Konfigurator/kgstartup.cpp:73 --- 2847,2851 ---- #: Konfigurator/kgstartup.cpp:68 Konfigurator/kgstartup.cpp:79 msgid "Homepage:" ! msgstr "Startseite:" #: Konfigurator/kgstartup.cpp:73 *************** *** 2884,2888 **** #: Konfigurator/kgstartup.cpp:99 msgid "Restore last position and size" ! msgstr "Wiederherstellen der letzten Postion und GröÃe" #: Konfigurator/kgcolors.cpp:57 --- 2879,2883 ---- #: Konfigurator/kgstartup.cpp:99 msgid "Restore last position and size" ! msgstr "Wiederherstellen der letzten Position und GröÃe" #: Konfigurator/kgcolors.cpp:57 *************** *** 3018,3027 **** #: Konfigurator/kggeneral.cpp:63 msgid "Use mimetype magic" ! msgstr "Mimetyp magic benutzen" #: Konfigurator/kggeneral.cpp:64 msgid "Mimetype magic allows better distinction of file types, but is slower" msgstr "" ! "Mimetyp magic erlaubt bessere Unterscheidung von Dateitypen, aber es ist " "langsamer" --- 3013,3022 ---- #: Konfigurator/kggeneral.cpp:63 msgid "Use mimetype magic" ! msgstr "Mimetype magic benutzen" #: Konfigurator/kggeneral.cpp:64 msgid "Mimetype magic allows better distinction of file types, but is slower" msgstr "" ! "Mimetype magic erlaubt bessere Unterscheidung von Dateitypen, aber es ist " "langsamer" *************** *** 3035,3039 **** "editor" msgstr "" ! "Tip: 'interner Editor' benutzen, um Krusader´s schnellen eingebauten Editor " "zu benutzen" --- 3030,3034 ---- "editor" msgstr "" ! "Tipp: 'internal editor' benutzen, um Krusaders schnellen eingebauten Editor " "zu benutzen" *************** *** 3044,3052 **** #: Konfigurator/kggeneral.cpp:89 msgid "Temp Directory:" ! msgstr "Temp. Verzeichnis:" #: Konfigurator/kggeneral.cpp:97 msgid "Note: you must have full permissions for the temporary directory !" ! msgstr "Info: Sie müssen volle Rechte für das Temp-Verzeichnis besitzen!" #: Konfigurator/kggeneral.cpp:119 --- 3039,3047 ---- #: Konfigurator/kggeneral.cpp:89 msgid "Temp Directory:" ! msgstr "Temporäres Verzeichnis:" #: Konfigurator/kggeneral.cpp:97 msgid "Note: you must have full permissions for the temporary directory !" ! msgstr "Info: Sie müssen volle Rechte für das temporäre Verzeichnis besitzen!" #: Konfigurator/kggeneral.cpp:119 *************** *** 3084,3088 **** #: Konfigurator/kggeneral.cpp:123 msgid ", sending files by email enabled.\n" ! msgstr ", senden von Dateien per e-mail aktiviert.\n" #: Konfigurator/kggeneral.cpp:124 --- 3079,3083 ---- #: Konfigurator/kggeneral.cpp:123 msgid ", sending files by email enabled.\n" ! msgstr ", senden von Dateien per E-Mail aktiviert.\n" #: Konfigurator/kggeneral.cpp:124 *************** *** 3093,3099 **** "\n" msgstr "" ! "mail: keine kompatiblen Mailprogramme gefunden. Senden von Dateien per e-" ! "mail ist deaktiviert.\n" ! "Tip: Krusader unterstützt kmail\n" "\n" --- 3088,3094 ---- "\n" msgstr "" ! "mail: keine kompatiblen E-Mail-Programme gefunden. Senden von Dateien per E-" ! "Mail ist deaktiviert.\n" ! "Tipp: Krusader unterstützt kmail\n" "\n" *************** *** 3156,3160 **** #: krslots.cpp:162 msgid "Don't know which files to compare." ! msgstr "Krusader weià nicht, welche Dateien verglichen werden sollen." #: krslots.cpp:163 --- 3151,3155 ---- #: krslots.cpp:162 msgid "Don't know which files to compare." ! msgstr "Weià nicht, welche Dateien verglichen werden sollen." #: krslots.cpp:163 *************** *** 3180,3184 **** "Can't find the 'locate' command. Please install the findutils-locate package " "of GNU, or set its dependencies in Konfigurator" ! msgstr "Das 'locate'-Kommando konnte nicht gefunden werden. Bitte installieren Sie das 'findutils-locate'-Paket von GNU oder setzen Sie die Abhängigkeiten im Konfigurator" #: krslots.cpp:345 --- 3175,3179 ---- "Can't find the 'locate' command. Please install the findutils-locate package " "of GNU, or set its dependencies in Konfigurator" ! msgstr "Der 'locate'-Befehl konnte nicht gefunden werden. Bitte installieren Sie das 'findutils-locate'-Paket von GNU oder setzen Sie die Abhängigkeiten im Konfigurator" #: krslots.cpp:345 *************** *** 3191,3196 **** "the bookmark button, select 'Add bookmark' and that's it!" msgstr "" ! "Wichtig: RemoteMan wurde durch unseren neuen Lesezeichenmanager ersetzt. Der neue Manager geht mit lokalen wie entfernten URLs gleichermassen um. RemoteMan bleibt noch bestehen um einen einfacheren Ãbergang zu gewährleisten und um Ihnen die Möglichkeit zu geben Ihre Lesezeichen zu verschieben. ER WIRD BALD ENTFERNT WERDEN!\n" ! "Probieren Sie den neuen Lesezeichenmanager aus: Ãffnen Sie eine neue Remote-Verbindung. Sobald dies geschehen ist, drücken Sie den Lesezeichen Knopf und wählen 'Lesezeichen hinzufügen'. Das ist schon alles!" #: krslots.cpp:374 --- 3186,3191 ---- "the bookmark button, select 'Add bookmark' and that's it!" msgstr "" ! "Wichtig: RemoteMan wurde durch unseren neuen Lesezeichenmanager ersetzt. Der neue Manager geht mit lokalen wie entfernten URLs gleichermaÃen um. RemoteMan bleibt noch bestehen um einen einfacheren Ãbergang zu gewährleisten und um Ihnen die Möglichkeit zu geben Ihre Lesezeichen zu verschieben. ER WIRD BALD ENTFERNT WERDEN!\n" ! "Probieren Sie den neuen Lesezeichenmanager aus: Ãffnen Sie eine neue Netzverbindung. Sobald dies geschehen ist, drücken Sie den Lesezeichen Knopf und wählen 'Lesezeichen hinzufügen'. Das ist schon alles!" #: krslots.cpp:374 *************** *** 3201,3205 **** msgid "Can't find \"KsysCtrl\". Please install KDE admin package" msgstr "" ! "\"KsysCtrl\" kann nicht gefunden werden. Bitte Installieren Sie das KDE " "Admin Paket" --- 3196,3200 ---- msgid "Can't find \"KsysCtrl\". Please install KDE admin package" msgstr "" ! "\"KsysCtrl\" konnte nicht gefunden werden. Bitte Installieren Sie das KDE " "Admin Paket" *************** *** 3209,3213 **** "You can get Krename at http://www.krename.net" msgstr "" ! "Es konnte kein Multiumbenennungswerkzeug gefunden werden.\n" "Sie können Krename von http://krename.net herunterladen." --- 3204,3208 ---- "You can get Krename at http://www.krename.net" msgstr "" ! "Es konnte kein Mehrfachumbenennungswerkzeug gefunden werden.\n" "Sie können Krename von http://krename.net herunterladen." *************** *** 3228,3232 **** #: krslots.cpp:554 msgid "Don't know which file to split." ! msgstr "Krusader weià nicht welche Datei aufgeteilt werden soll." #: krslots.cpp:563 --- 3223,3227 ---- #: krslots.cpp:554 msgid "Don't know which file to split." ! msgstr "Weià nicht welche Datei aufgeteilt werden soll." #: krslots.cpp:563 *************** *** 3236,3244 **** #: krslots.cpp:595 msgid "Don't know which files to combine." ! msgstr "Krusader weià nicht welche Dateien kombiniert werden sollen." #: krslots.cpp:607 msgid "You can't combine a directory!" ! msgstr "Sie können kein Verzeichnis kombinieren." #: krslots.cpp:623 krslots.cpp:686 --- 3231,3239 ---- #: krslots.cpp:595 msgid "Don't know which files to combine." ! msgstr "Weià nicht welche Dateien zusammengefügt werden sollen." #: krslots.cpp:607 msgid "You can't combine a directory!" ! msgstr "Sie können kein Verzeichnis zusammenfügen." #: krslots.cpp:623 krslots.cpp:686 *************** *** 3252,3256 **** #: krslots.cpp:693 msgid "Combining %1.* to directory:" ! msgstr "Kombiniere %1.* in das Verzeichnis:" #: resources.h:38 --- 3247,3251 ---- #: krslots.cpp:693 msgid "Combining %1.* to directory:" ! msgstr "Zusammenfügen von %1.* in Verzeichnis:" #: resources.h:38 *************** *** 3329,3333 **** #: krusader.cpp:380 msgid "Show &Command Line" ! msgstr "&Kommandozeile anzeigen" #: krusader.cpp:383 --- 3324,3328 ---- #: krusader.cpp:380 msgid "Show &Command Line" ! msgstr "Befehlszeile anzeigen" #: krusader.cpp:383 |
|
From: Dirk E. <des...@us...> - 2004-04-16 23:35:05
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2719/po Modified Files: de.po Log Message: Index: de.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** de.po 16 Apr 2004 21:19:23 -0000 1.6 --- de.po 16 Apr 2004 23:34:54 -0000 1.7 *************** *** 2,5 **** --- 2,6 ---- # translation of de.po to # translation of de.po to + # translation of de.po to # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # Christoph Thielecke <cri...@gm...>, 2003. *************** *** 11,15 **** "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-29 20:37+0000\n" ! "PO-Revision-Date: 2004-04-16 22:54+0200\n" "Last-Translator: Dirk Eschler <des...@us...>\n" "Language-Team: \n" --- 12,16 ---- "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-03-29 20:37+0000\n" ! "PO-Revision-Date: 2004-04-17 01:32+0200\n" "Last-Translator: Dirk Eschler <des...@us...>\n" "Language-Team: \n" *************** *** 115,119 **** msgstr "" "Die CRC-Information der Datei (%1) fehlt!\n" ! "Eine Gültigkeitsüberprüfung ist ohne diese unmöglich. Mit dem Zusammenfügen dennoch fortfahren?" #: Splitter/combiner.cpp:115 --- 116,120 ---- msgstr "" "Die CRC-Information der Datei (%1) fehlt!\n" ! "Eine Gültigkeitsüberprüfung ist ohne diese unmöglich. Mit dem Zusammenfügen fortfahren?" #: Splitter/combiner.cpp:115 *************** *** 127,131 **** #: Splitter/combiner.cpp:138 msgid "Validity checking is impossible without a good CRC file. Continue combining?" ! msgstr "Eine Gültigkeitsüberprüfung ist ohne eine gültige CRC-Datei unmöglich. Mit dem Zusammenfügen dennoch fortfahren?" #: Splitter/combiner.cpp:239 --- 128,132 ---- #: Splitter/combiner.cpp:138 msgid "Validity checking is impossible without a good CRC file. Continue combining?" ! msgstr "Eine Gültigkeitsüberprüfung ist ohne eine gültige CRC-Datei unmöglich. Mit dem Zusammenfügen fortfahren?" #: Splitter/combiner.cpp:239 *************** *** 318,322 **** #: Search/krsearchdialogbase.cpp:431 Search/krsearchdialogbase.cpp:442 msgid "Bytes" ! msgstr "Byte" #: Search/krsearchdialogbase.cpp:432 Search/krsearchdialogbase.cpp:443 --- 319,323 ---- #: Search/krsearchdialogbase.cpp:431 Search/krsearchdialogbase.cpp:442 msgid "Bytes" ! msgstr "Bytes" #: Search/krsearchdialogbase.cpp:432 Search/krsearchdialogbase.cpp:443 *************** *** 434,438 **** #: Search/krsearchdialogbase.cpp:695 msgid "Note: a '?' is a wildcard" ! msgstr "Info: ein '?' ist ein Wildcard" #: Search/krsearchdialogbase.cpp:700 --- 435,439 ---- #: Search/krsearchdialogbase.cpp:695 msgid "Note: a '?' is a wildcard" ! msgstr "Info: Ein '?' ist ein Wildcard" #: Search/krsearchdialogbase.cpp:700 *************** *** 464,472 **** #: Search/krsearchdialog.cpp:121 msgid "Invalid date entered." ! msgstr "Ãngültiges Datum eingegeben." #: Search/krsearchdialog.cpp:122 msgid "The date '" ! msgstr "Datum '" #: Search/krsearchdialog.cpp:122 --- 465,473 ---- #: Search/krsearchdialog.cpp:121 msgid "Invalid date entered." ! msgstr "Ungültiges Datum eingegeben." #: Search/krsearchdialog.cpp:122 msgid "The date '" ! msgstr "Das Datum '" #: Search/krsearchdialog.cpp:122 *************** *** 586,594 **** #: BookMan/addbookmarkdlg.cpp:29 BookMan/addbookmarkform.cpp:86 msgid "Bookmark name:" ! msgstr "Name des Lesezeichens" #: BookMan/addbookmarkdlg.cpp:30 BookMan/addbookmarkform.cpp:87 msgid "URL:" ! msgstr "Adresse:" #: BookMan/addbookmarkform.cpp:85 --- 587,595 ---- #: BookMan/addbookmarkdlg.cpp:29 BookMan/addbookmarkform.cpp:86 msgid "Bookmark name:" ! msgstr "Name des Lesezeichens:" #: BookMan/addbookmarkdlg.cpp:30 BookMan/addbookmarkform.cpp:87 msgid "URL:" ! msgstr "URL:" #: BookMan/addbookmarkform.cpp:85 *************** *** 719,727 **** #: Synchronizer/synchronizergui.cpp:831 msgid "Follow symlinks" ! msgstr "Verknüpfungen folgen" #: Synchronizer/synchronizergui.cpp:834 msgid "Follows the symbolic links also at comparing" ! msgstr "Folgt den Verknüpfungen auch beim Vergleichen" #: Synchronizer/synchronizergui.cpp:835 --- 720,728 ---- #: Synchronizer/synchronizergui.cpp:831 msgid "Follow symlinks" ! msgstr "Symbolischen Verknüpfungen folgen" #: Synchronizer/synchronizergui.cpp:834 msgid "Follows the symbolic links also at comparing" ! msgstr "Folgt den symbolischen Verknüpfungen auch beim Vergleichen" #: Synchronizer/synchronizergui.cpp:835 *************** *** 743,747 **** msgstr "" "Ingnoriert die Datums-Information beim Vergleichen (nützlich falls die Dateien\n" ! "von FTP, SMB, Archiv, ... Dateisystemen kommen)" #: Synchronizer/synchronizergui.cpp:841 --- 744,748 ---- msgstr "" "Ingnoriert die Datums-Information beim Vergleichen (nützlich falls die Dateien\n" ! "von ftp, smb, Archiv, ... -Dateisystemen kommen)" #: Synchronizer/synchronizergui.cpp:841 *************** *** 793,797 **** #: Synchronizer/synchronizergui.cpp:905 msgid "Lists the files marked to delete" ! msgstr "Listet Dateien auf die als `zu löschen` markiert wurden" #: Synchronizer/synchronizergui.cpp:909 --- 794,798 ---- #: Synchronizer/synchronizergui.cpp:905 msgid "Lists the files marked to delete" ! msgstr "Listet Dateien auf die als `Zu löschen` markiert wurden" #: Synchronizer/synchronizergui.cpp:909 *************** *** 977,981 **** #: MountMan/kmountman.cpp:531 MountMan/kmountman.cpp:566 krslots.cpp:363 msgid "Can't start 'mount'! Check the 'Dependencies' page in konfigurator." ! msgstr "Konnte 'mount' nicht starten! Ãberprüfen Sie die 'Abhängigkeiten'-Seite im Konfigurator." #: MountMan/kmountman.cpp:544 --- 978,982 ---- #: MountMan/kmountman.cpp:531 MountMan/kmountman.cpp:566 krslots.cpp:363 msgid "Can't start 'mount'! Check the 'Dependencies' page in konfigurator." ! msgstr "Konnte 'mount' nicht ausführen! Ãberprüfen Sie die 'Abhängigkeiten'-Seite im Konfigurator." #: MountMan/kmountman.cpp:544 *************** *** 984,989 **** "check that /bin/mount or /sbin/mount are availble" msgstr "" ! "'mount' kann nicht ausgeführt werden!!!\n" ! "Bitte überprüfen Sie, ob /bin/mount oder /sbin/mount verfügbar ist" #: MountMan/kmountman.cpp:550 MountMan/kmountman.cpp:596 --- 985,990 ---- "check that /bin/mount or /sbin/mount are availble" msgstr "" ! "Konnte 'mount' nicht ausführen!\n" ! "Stellen Sie sicher, daà /bin/mount oder /sbin/mount verfügbar ist" #: MountMan/kmountman.cpp:550 MountMan/kmountman.cpp:596 *************** *** 1017,1026 **** "availble" msgstr "" ! "'mount' kann nicht ausgeführt werden!\n" ! "Bitte überprüfen, ob /bin/mount oder /sbin/mount verfügbar ist" #: MountMan/kmountman.cpp:615 msgid "Can't start 'umount'! Check the 'Dependencies' page in konfigurator." ! msgstr "Konnte 'unmount' nicht starten! Ãberprüfen Sie die 'Abhängigkeiten'-Seite im Konfigurator." #: MountMan/kmountman.cpp:625 --- 1018,1027 ---- "availble" msgstr "" ! "Konnte 'mount' nicht ausführen!\n" ! "Stellen Sie sicher, daà /bin/mount oder /sbin/mount verfügbar ist" #: MountMan/kmountman.cpp:615 msgid "Can't start 'umount'! Check the 'Dependencies' page in konfigurator." ! msgstr "Konnte 'unmount' nicht ausführen! Ãberprüfen Sie die 'Abhängigkeiten'-Seite im Konfigurator." #: MountMan/kmountman.cpp:625 *************** *** 1037,1041 **** #: MountMan/kmountman.cpp:632 msgid "Unmounting device, please wait ..." ! msgstr "Gerät wird ausgehängt, bitte warten..." #: MountMan/kmountman.cpp:637 --- 1038,1042 ---- #: MountMan/kmountman.cpp:632 msgid "Unmounting device, please wait ..." ! msgstr "Gerät wird ausgehängt, bitte warten ..." #: MountMan/kmountman.cpp:637 *************** *** 1044,1049 **** "availble" msgstr "" ! "'umount' kann nicht ausgeführt werden! Bitte überprüfen, ob /bin/umount " ! "oder /sbin/umount verfügbar ist" #: MountMan/kmountman.cpp:644 --- 1045,1050 ---- "availble" msgstr "" ! "Konnte 'mount' nicht ausführen!\n" ! "Stellen Sie sicher, daà /bin/mount oder /sbin/mount verfügbar ist" #: MountMan/kmountman.cpp:644 *************** *** 1057,1065 **** #: MountMan/kmountman.cpp:687 msgid "No space information on a [procfs]" ! msgstr "Keine Platzinformation auf einem [procfs]" #: MountMan/kmountman.cpp:690 msgid "No space information on a [proc]" ! msgstr "Keine Platzinformation auf einem [proc]" #: MountMan/kmountman.cpp:698 --- 1058,1066 ---- #: MountMan/kmountman.cpp:687 msgid "No space information on a [procfs]" ! msgstr "Keine Speicherplatzinformation auf einem [procfs]" #: MountMan/kmountman.cpp:690 msgid "No space information on a [proc]" ! msgstr "Keine Speicherplatzinformation auf einem [proc]" #: MountMan/kmountman.cpp:698 *************** *** 1119,1124 **** "terminal mode is active." msgstr "" ! "Der 'In Terminal ausführen'-Knopf erlaubt Krusader ein Konsolenprogramm " ! "(oder sonstige nicht-graphisches) Programme in einem Terminal Ihrer Wahl auszuführen. " "Wenn er angeklickt wurde, ist der Terminal-Modus aktiv." --- 1120,1125 ---- "terminal mode is active." msgstr "" ! "Der 'In Terminal ausführen'-Knopf erlaubt Krusader Konsolenprogramme" ! "(oder sonstige nicht-graphische Programme) in einem Terminal Ihrer Wahl auszuführen. " "Wenn er angeklickt wurde, ist der Terminal-Modus aktiv." *************** *** 1179,1183 **** #: GUI/kfnkeys.cpp:71 msgid "Create directory in current panel." ! msgstr "Verzeichnis erstellen im aktuellen Dateifenster." #: GUI/kfnkeys.cpp:74 krusader.cpp:337 --- 1180,1184 ---- #: GUI/kfnkeys.cpp:71 msgid "Create directory in current panel." ! msgstr "Verzeichnis im aktuellen Dateifenster erstellen." #: GUI/kfnkeys.cpp:74 krusader.cpp:337 *************** *** 1231,1235 **** #: RemoteMan/remotemanbase.cpp:100 Dialogs/newftpgui.cpp:714 msgid "Password:" ! msgstr "PaÃwort:" #: RemoteMan/remotemanbase.cpp:109 --- 1232,1236 ---- #: RemoteMan/remotemanbase.cpp:100 Dialogs/newftpgui.cpp:714 msgid "Password:" ! msgstr "Passwort:" #: RemoteMan/remotemanbase.cpp:109 *************** *** 1251,1263 **** #: RemoteMan/remotemanbase.cpp:162 msgid "Co&nnect" ! msgstr "&Verbinden" #: RemoteMan/remotemanbase.cpp:170 msgid "New &Group" ! msgstr "Neue &Gruppe" #: RemoteMan/remotemanbase.cpp:179 msgid "New Connec&tion" ! msgstr "Neue &Verbindung" #: RemoteMan/remotemanbase.cpp:193 Dialogs/newftpgui.cpp:693 --- 1252,1264 ---- #: RemoteMan/remotemanbase.cpp:162 msgid "Co&nnect" ! msgstr "Verbinden" #: RemoteMan/remotemanbase.cpp:170 msgid "New &Group" ! msgstr "Neue Gruppe" #: RemoteMan/remotemanbase.cpp:179 msgid "New Connec&tion" ! msgstr "Neue Verbindung" #: RemoteMan/remotemanbase.cpp:193 Dialogs/newftpgui.cpp:693 *************** *** 1287,1291 **** #: RemoteMan/remotemanbase.cpp:235 msgid "* Warning: Storing your password is not secure !!!" ! msgstr "Warnung: Die Speichung des PaÃwortes ist unsicher!!!" #: RemoteMan/remoteman.cpp:84 RemoteMan/remoteman.cpp:87 --- 1288,1292 ---- #: RemoteMan/remotemanbase.cpp:235 msgid "* Warning: Storing your password is not secure !!!" ! msgstr "* Warnung: Die Speicherung des Passwortes ist unsicher!!!" #: RemoteMan/remoteman.cpp:84 RemoteMan/remoteman.cpp:87 *************** *** 1319,1323 **** #: UserMenu/usermenuaddimpl.cpp:53 msgid "Please set a name for the menu entry" ! msgstr "Bitte einen Namen für den Menueintrag eingeben" #: UserMenu/usermenuaddimpl.cpp:56 --- 1320,1324 ---- #: UserMenu/usermenuaddimpl.cpp:53 msgid "Please set a name for the menu entry" ! msgstr "Bitte einen Namen für den Menüeintrag eingeben" #: UserMenu/usermenuaddimpl.cpp:56 *************** *** 1367,1371 **** #: UserMenu/usermenu.cpp:368 msgid "Close this window" ! msgstr "Dieses Fenster schliessen" #: UserMenu/usermenu.cpp:371 --- 1368,1372 ---- #: UserMenu/usermenu.cpp:368 msgid "Close this window" ! msgstr "Dieses Fenster schlieÃen" #: UserMenu/usermenu.cpp:371 *************** *** 1484,1488 **** #: VFS/krarchandler.cpp:284 msgid "Packing File(s)" ! msgstr "Dateien werden gepackt" #: VFS/krarchandler.cpp:300 --- 1485,1489 ---- #: VFS/krarchandler.cpp:284 msgid "Packing File(s)" ! msgstr "Datei(en) werden gepackt" #: VFS/krarchandler.cpp:300 *************** *** 1512,1516 **** #: VFS/arc_vfs.cpp:603 msgid "Repacking..." ! msgstr "Wird neugepackt..." #: VFS/ftp_vfs.cpp:148 --- 1513,1517 ---- #: VFS/arc_vfs.cpp:603 msgid "Repacking..." ! msgstr "Wird neu gepackt..." #: VFS/ftp_vfs.cpp:148 *************** *** 1536,1552 **** #: KViewer/krviewer.cpp:55 msgid "&Generic viewer" ! msgstr "&Generischer Anzeiger" #: KViewer/krviewer.cpp:56 msgid "&Text viewer" ! msgstr "&Textanzeiger" #: KViewer/krviewer.cpp:57 msgid "&Hex viewer" ! msgstr "&Hexanzeiger" #: KViewer/krviewer.cpp:59 msgid "Text &editor" ! msgstr "Text&editor" #: KViewer/krviewer.cpp:132 --- 1537,1553 ---- #: KViewer/krviewer.cpp:55 msgid "&Generic viewer" ! msgstr "&Generischer Betrachter" #: KViewer/krviewer.cpp:56 msgid "&Text viewer" ! msgstr "&Textbetrachter" #: KViewer/krviewer.cpp:57 msgid "&Hex viewer" ! msgstr "&Hexbetrachter" #: KViewer/krviewer.cpp:59 msgid "Text &editor" ! msgstr "Texteditor" #: KViewer/krviewer.cpp:132 *************** *** 1565,1569 **** #: KViewer/krviewer.cpp:278 msgid "KrViewer is unable to download: " ! msgstr "KrViewer kann nicht herunterladen: " #: KViewer/krviewer.cpp:338 --- 1566,1570 ---- #: KViewer/krviewer.cpp:278 msgid "KrViewer is unable to download: " ! msgstr "KrViewer kann folgendes nicht herunterladen: " #: KViewer/krviewer.cpp:338 *************** *** 1617,1621 **** #: Panel/krcalcspacedialog.cpp:147 msgid "Total occupied space: %1" ! msgstr "Insgesamt belegter Platz: %1" #: Panel/krcalcspacedialog.cpp:150 --- 1618,1622 ---- #: Panel/krcalcspacedialog.cpp:147 msgid "Total occupied space: %1" ! msgstr "Belegter Speicherplatz ingesamt: %1" #: Panel/krcalcspacedialog.cpp:150 *************** *** 1633,1637 **** #: Panel/panelfunc.cpp:167 msgid "The current file is not a link, so i can't redirect it." ! msgstr "Die aktuelle Datei ist keine Verknüpfung, so kann sie nicht umgelenkt werden." #: Panel/panelfunc.cpp:174 --- 1634,1638 ---- #: Panel/panelfunc.cpp:167 msgid "The current file is not a link, so i can't redirect it." ! msgstr "Die aktuelle Datei ist keine Verknüpfung, daher kann sie nicht umgelenkt werden." #: Panel/panelfunc.cpp:174 *************** *** 1699,1703 **** #: Panel/panelfunc.cpp:347 msgid "You can't move files to this file system" ! msgstr "Sie können keine Dateien zu diesem Dateisystem verschieben" #: Panel/panelfunc.cpp:372 --- 1700,1704 ---- #: Panel/panelfunc.cpp:347 msgid "You can't move files to this file system" ! msgstr "Sie können keine Dateien auf dieses Dateisystem verschieben" #: Panel/panelfunc.cpp:372 *************** *** 1725,1729 **** #, c-format msgid " %d files ?" ! msgstr "%d Dateien?" #: Panel/panelfunc.cpp:468 --- 1726,1730 ---- #, c-format msgid " %d files ?" ! msgstr "%d Dateien ?" #: Panel/panelfunc.cpp:468 *************** *** 1741,1745 **** #: Panel/panelfunc.cpp:475 msgid "Are you sure you want to " ! msgstr "Sind Sie sicher, dass Sie folgendes löschen wollen:" #: Panel/panelfunc.cpp:495 --- 1742,1746 ---- #: Panel/panelfunc.cpp:475 msgid "Are you sure you want to " ! msgstr "Möchten Sie folgenden Eintrag wirklich löschen:" #: Panel/panelfunc.cpp:495 *************** *** 1769,1777 **** #: Panel/panelfunc.cpp:587 msgid " already exists, Do you want to overwrite the archive " ! msgstr " exisiert bereits, möchten Sie das Archiv überschreiben " #: Panel/panelfunc.cpp:588 msgid "(all data in previous archive will be lost)" ! msgstr "(alle Daten im vorherigen Archiv werden verloren gehen)" #: Panel/panelfunc.cpp:588 --- 1770,1778 ---- #: Panel/panelfunc.cpp:587 msgid " already exists, Do you want to overwrite the archive " ! msgstr " existiert bereits, möchten Sie das Archiv überschreiben " #: Panel/panelfunc.cpp:588 msgid "(all data in previous archive will be lost)" ! msgstr "(alle Daten im vorherigen Archiv gehen verloren)" #: Panel/panelfunc.cpp:588 *************** *** 1797,1801 **** #: Panel/panelfunc.cpp:645 Panel/panelfunc.cpp:647 msgid "Unpack " ! msgstr "Entpacken" #: Panel/panelfunc.cpp:647 --- 1798,1802 ---- #: Panel/panelfunc.cpp:645 Panel/panelfunc.cpp:647 msgid "Unpack " ! msgstr "Entpacke " #: Panel/panelfunc.cpp:647 *************** *** 1827,1834 **** "The status bar displays information about the FILESYSTEM which hold your " "current directory: Total size, free space, type of filesystem etc." ! msgstr "" ! "Die Statusleiste zeigt Informationen über das Dateisystem an, welches das " ! "aktuelle Verzeichnis enthält: Gesamte GröÃe, freier Platz, Dateisystemtyp " ! "etc." #: Panel/listpanel.cpp:126 --- 1828,1832 ---- "The status bar displays information about the FILESYSTEM which hold your " "current directory: Total size, free space, type of filesystem etc." ! msgstr "Die Statusleiste zeigt Informationen über das Dateisystem des aktuellen Verzeichnisses an: GesamtgröÃe, Freier Speicherplatz, Typ des Dateisystems, etc." #: Panel/listpanel.cpp:126 *************** *** 1845,1854 **** "bytes math" msgstr "" ! "Die Ãbersichtsleiste zeigt wieviele Dateien vorhanden sind, wieviel Sie " ! "ausgewählt haben und Bytes ausgewählt sind" #: Panel/listpanel.cpp:154 msgid "Use superb KDE file dialog to choose location. " ! msgstr "Den groÃartigen KDE Dateidialog benutzen um eine Adresse auszuwählen. " #: Panel/listpanel.cpp:158 --- 1843,1852 ---- "bytes math" msgstr "" ! "Die Ãbersichtsleiste zeigt wieviele Dateien vorhanden sind, wieviele Sie " ! "ausgewählt haben und wieviele Bytes ingesamt ausgewählt sind" #: Panel/listpanel.cpp:154 msgid "Use superb KDE file dialog to choose location. " ! msgstr "Den groÃartigen KDE-Dateidialog benutzen um eine Adresse auszuwählen. " #: Panel/listpanel.cpp:158 *************** *** 1880,1884 **** #: Panel/listpanel.cpp:297 msgid " Unselect Files " ! msgstr " Dateien aufheben" #: Panel/listpanel.cpp:351 Panel/listpanel.cpp:358 --- 1878,1882 ---- #: Panel/listpanel.cpp:297 msgid " Unselect Files " ! msgstr " Dateiauswahl aufheben" #: Panel/listpanel.cpp:351 Panel/listpanel.cpp:358 *************** *** 1896,1904 **** #: Panel/listpanel.cpp:417 msgid "No space information inside archives" ! msgstr "Keine Platzinformation in Archiven" #: Panel/listpanel.cpp:422 msgid "No space information on non-local filesystems" ! msgstr "Keine GröÃeninformation bei nicht lokalen Dateisystemen" #: Panel/listpanel.cpp:429 --- 1894,1902 ---- #: Panel/listpanel.cpp:417 msgid "No space information inside archives" ! msgstr "Keine Speicherplatzinformation innerhalb von Archiven" #: Panel/listpanel.cpp:422 msgid "No space information on non-local filesystems" ! msgstr "Keine Speicherplatzinformation auf nicht-lokalen Dateisystemen" #: Panel/listpanel.cpp:429 *************** *** 1956,1964 **** #: Panel/listpanel.cpp:661 msgid "new symlink" ! msgstr "neue symbolische Verknüpfung" #: Panel/listpanel.cpp:662 msgid "new hardlink" ! msgstr "neue harte Verknüpfung" #: Panel/listpanel.cpp:664 --- 1954,1962 ---- #: Panel/listpanel.cpp:661 msgid "new symlink" ! msgstr "Neue symbolische Verknüpfung" #: Panel/listpanel.cpp:662 msgid "new hardlink" ! msgstr "Neue harte Verknüpfung" #: Panel/listpanel.cpp:664 *************** *** 2008,2016 **** #: Dialogs/krspecialwidgets.cpp:105 msgid "Unable to get information" ! msgstr "Information können nicht bekommen werden" #: Dialogs/krspecialwidgets.cpp:106 msgid "on a supermounted device." ! msgstr "auf einem mit supermount eingehängtem Gerät." #: Dialogs/krspecialwidgets.cpp:107 --- 2006,2014 ---- #: Dialogs/krspecialwidgets.cpp:105 msgid "Unable to get information" ! msgstr "Kann keine Information einholen" #: Dialogs/krspecialwidgets.cpp:106 msgid "on a supermounted device." ! msgstr "von einem mit supermount eingehängtem Gerät." #: Dialogs/krspecialwidgets.cpp:107 *************** *** 2068,2076 **** #: Dialogs/packguibase.cpp:422 Dialogs/packguibase.cpp:475 msgid "Pack" ! msgstr "Packen" #: Dialogs/packguibase.cpp:432 msgid "To archive" ! msgstr "Zum Archiv" #: Dialogs/packguibase.cpp:439 --- 2066,2074 ---- #: Dialogs/packguibase.cpp:422 Dialogs/packguibase.cpp:475 msgid "Pack" ! msgstr "Packe" #: Dialogs/packguibase.cpp:432 msgid "To archive" ! msgstr "In das Archiv" #: Dialogs/packguibase.cpp:439 *************** *** 2080,2084 **** #: Dialogs/packguibase.cpp:450 msgid "In directory" ! msgstr "In diesem Verzeichnis" #: Dialogs/krmaskchoice.cpp:58 --- 2078,2082 ---- #: Dialogs/packguibase.cpp:450 msgid "In directory" ! msgstr "In dieses Verzeichnis" #: Dialogs/krmaskchoice.cpp:58 *************** *** 2106,2112 **** "gute\n" "Bespiele sind *.c, *.h, *.c *.o etc. Sie können diese Masken zur Liste " ! "hinzufügen, indem Sie diese eingeben und den hinzufügen-Knopf drücken.\n" ! "Löschen löscht eine vordefinierte Auswahl und Leeren löscht alle. Info: das " ! "Eingabefeld hat eine eigene History, Sie können dieses aufklappen, wenn Sie " "möchten." --- 2104,2110 ---- "gute\n" "Bespiele sind *.c, *.h, *.c *.o etc. Sie können diese Masken zur Liste " ! "hinzufügen, indem Sie diese eingeben und den Hinzufügen-Knopf drücken.\n" ! "Löschen löscht eine vordefinierte Auswahl und Leeren löscht alle. Info: Das " ! "Eingabefeld hat einen eigenen Verlauf, Sie können diesen aufklappen, wenn Sie " "möchten." *************** *** 2133,2137 **** #: Dialogs/krprogress.cpp:112 msgid "Krusader Progress" ! msgstr "Krusaderprozess" #: Dialogs/krprogress.cpp:165 --- 2131,2135 ---- #: Dialogs/krprogress.cpp:112 msgid "Krusader Progress" ! msgstr "Krusader Fortschritt" #: Dialogs/krprogress.cpp:165 *************** *** 3379,3383 **** #: krusader.cpp:410 msgid "Calculate &Occupied Space" ! msgstr "&Belegten Platz berechnen" #: krusader.cpp:412 --- 3377,3381 ---- #: krusader.cpp:410 msgid "Calculate &Occupied Space" ! msgstr "Belegten Speicherplatz berechnen" #: krusader.cpp:412 *************** *** 3387,3391 **** #: krusader.cpp:414 msgid "Pac&k" ! msgstr "Pac&ken" #: krusader.cpp:416 --- 3385,3389 ---- #: krusader.cpp:414 msgid "Pac&k" ! msgstr "Packen" #: krusader.cpp:416 *************** *** 3399,3411 **** #: krusader.cpp:420 msgid "Com&bine files" ! msgstr "Datei kombinieren" #: krusader.cpp:422 msgid "Select &Group" ! msgstr "&Gruppe auswählen" #: krusader.cpp:424 msgid "&Select All" ! msgstr "Alle au&swählen" #: krusader.cpp:426 --- 3397,3409 ---- #: krusader.cpp:420 msgid "Com&bine files" ! msgstr "Dateien zusammenfügen" #: krusader.cpp:422 msgid "Select &Group" ! msgstr "Gruppe auswählen" #: krusader.cpp:424 msgid "&Select All" ! msgstr "Alle auswählen" #: krusader.cpp:426 *************** *** 3415,3419 **** #: krusader.cpp:428 msgid "&Terminal" ! msgstr "&Terminal" #: krusader.cpp:430 --- 3413,3417 ---- #: krusader.cpp:428 msgid "&Terminal" ! msgstr "Terminal" #: krusader.cpp:430 *************** *** 3423,3427 **** #: krusader.cpp:433 krusader.cpp:438 msgid "&MountMan" ! msgstr "&MountMan" #: krusader.cpp:442 --- 3421,3425 ---- #: krusader.cpp:433 krusader.cpp:438 msgid "&MountMan" ! msgstr "MountMan" #: krusader.cpp:442 *************** *** 3443,3451 **** #: krusader.cpp:450 msgid "&Unselect Group" ! msgstr "Gruppen aufheben" #: krusader.cpp:452 msgid "&Konfigurator" ! msgstr "&Konfigurator" #: krusader.cpp:456 --- 3441,3449 ---- #: krusader.cpp:450 msgid "&Unselect Group" ! msgstr "Gruppenauswahl aufheben" #: krusader.cpp:452 msgid "&Konfigurator" ! msgstr "Konfigurator" #: krusader.cpp:456 *************** *** 3459,3467 **** #: krusader.cpp:460 msgid "&All Files" ! msgstr "&Alle Dateien" #: krusader.cpp:464 msgid "&Custom" ! msgstr "&Benutzerdefiniert" #: krusader.cpp:466 --- 3457,3465 ---- #: krusader.cpp:460 msgid "&All Files" ! msgstr "Alle Dateien" #: krusader.cpp:464 msgid "&Custom" ! msgstr "Benutzerdefiniert" #: krusader.cpp:466 *************** *** 3507,3511 **** #: krusader.cpp:489 msgid "Highlight files by using a filter" ! msgstr "Hervorhebung von Dateien durch Filter" #: krusader.cpp:490 --- 3505,3509 ---- #: krusader.cpp:489 msgid "Highlight files by using a filter" ! msgstr "Hervorhebung von Dateien durch einen Filter" #: krusader.cpp:490 *************** *** 3575,3583 **** #: rc.cpp:2 msgid "&Mark" ! msgstr "&Markieren" #: rc.cpp:3 msgid "&Commands" ! msgstr "&Befehle" #: _translatorinfo.cpp:1 --- 3573,3581 ---- #: rc.cpp:2 msgid "&Mark" ! msgstr "Markieren" #: rc.cpp:3 msgid "&Commands" ! msgstr "Befehle" #: _translatorinfo.cpp:1 |
|
From: Dirk E. <des...@us...> - 2004-04-16 21:20:30
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7537/krusader Modified Files: main.cpp Log Message: updated translation credit Index: main.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/main.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.cpp 20 Mar 2004 09:37:25 -0000 1.25 --- main.cpp 16 Apr 2004 21:20:21 -0000 1.26 *************** *** 82,85 **** --- 82,86 ---- aboutData.addCredit("Mitek","Czech translation","mi...@em...",0); aboutData.addCredit("Christoph Thielecke","German translation","cri...@gm...",0); + aboutData.addCredit("Dirk Eschler", "Updated German translation", "des...@us...", 0); aboutData.addCredit("René-Pierre Lehmann","French translation","ri...@le...",0); aboutData.addCredit("Rafa Munoz","Spanish translation","mu...@ie...",0); |
|
From: Dirk E. <des...@us...> - 2004-04-16 21:19:33
|
Update of /cvsroot/krusader/krusader_kde3/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7239/po Modified Files: de.po Log Message: Index: de.po =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** de.po 30 Aug 2003 23:59:35 -0000 1.5 --- de.po 16 Apr 2004 21:19:23 -0000 1.6 *************** *** 1,13 **** # translation of de.po to # translation of de.po to ! # Copyright (C) 2003 Free Software Foundation, Inc. ! # Christoph Thielecke <cri...@gm...>, 2003 ! # Dirk Eschler <des...@us...>, 2003 # msgid "" msgstr "" "Project-Id-Version: de\n" ! "POT-Creation-Date: 2003-05-28 01:53+0300\n" [...5990 lines suppressed...] ! #: rc.cpp:2 ! msgid "&Mark" ! msgstr "&Markieren" ! ! #: rc.cpp:3 ! msgid "&Commands" ! msgstr "&Befehle" ! ! #: _translatorinfo.cpp:1 ! msgid "" ! "_: NAME OF TRANSLATORS\n" ! "Your names" ! msgstr "Christoph Thielecke,Dirk Eschler" ! ! #: _translatorinfo.cpp:3 ! msgid "" ! "_: EMAIL OF TRANSLATORS\n" ! "Your emails" ! msgstr "cri...@gm...,des...@us..." |
|
From: Dirk E. <des...@us...> - 2004-04-16 21:19:32
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7239 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.204 retrieving revision 1.205 diff -C2 -d -r1.204 -r1.205 *** ChangeLog 15 Apr 2004 06:33:57 -0000 1.204 --- ChangeLog 16 Apr 2004 21:19:24 -0000 1.205 *************** *** 1,4 **** --- 1,5 ---- FIXED: dragging over a new tab changes active tab FIXED: crash at pressing space on the '..' directory + UPDATED: German translation 1.40-beta1 |
|
From: Karai C. <ck...@us...> - 2004-04-15 06:34:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: UNCOMMIT: the KDE 3.2 left justification fix does not work on KDE 3.1.1 :-( Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** panelmanager.cpp 14 Apr 2004 20:51:41 -0000 1.7 --- panelmanager.cpp 15 Apr 2004 06:33:58 -0000 1.8 *************** *** 42,51 **** connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 3 ); _layout->addWidget( _newTab, 1, 0 ); _layout->addWidget( _tabbar, 1, 1 ); ! /* KDE 3.2 error, inserting a new spacer item to fix the left justification bug */ ! _layout->addItem( new QSpacerItem(0,0, QSizePolicy::Expanding, QSizePolicy::Minimum), 1, 2 ); ! _layout->addWidget( _closeTab, 1, 3 ); if (HIDE_ON_SINGLE_TAB) HIDE --- 42,49 ---- connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 ); _layout->addWidget( _newTab, 1, 0 ); _layout->addWidget( _tabbar, 1, 1 ); ! _layout->addWidget( _closeTab, 1, 2 ); if (HIDE_ON_SINGLE_TAB) HIDE |
|
From: Karai C. <ck...@us...> - 2004-04-15 06:34:10
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2698/krusader_kde3 Modified Files: ChangeLog Log Message: UNCOMMIT: the KDE 3.2 left justification fix does not work on KDE 3.1.1 :-( Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.203 retrieving revision 1.204 diff -C2 -d -r1.203 -r1.204 *** ChangeLog 14 Apr 2004 20:51:41 -0000 1.203 --- ChangeLog 15 Apr 2004 06:33:57 -0000 1.204 *************** *** 1,3 **** - FIXED: KDE 3.2 panels are justified to right FIXED: dragging over a new tab changes active tab FIXED: crash at pressing space on the '..' directory --- 1,2 ---- |
|
From: Karai C. <ck...@us...> - 2004-04-14 20:51:50
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32594/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: FIXED: paneltabs are justified to right in KDE 3.2 Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** panelmanager.cpp 9 Mar 2004 22:59:52 -0000 1.6 --- panelmanager.cpp 14 Apr 2004 20:51:41 -0000 1.7 *************** *** 42,49 **** connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 2 ); _layout->addWidget( _newTab, 1, 0 ); _layout->addWidget( _tabbar, 1, 1 ); ! _layout->addWidget( _closeTab, 1, 2 ); if (HIDE_ON_SINGLE_TAB) HIDE --- 42,51 ---- connect( _tabbar, SIGNAL( newTab(QString) ), this, SLOT( slotNewTab(QString) ) ); ! _layout->addMultiCellWidget( _stack, 0, 0, 0, 3 ); _layout->addWidget( _newTab, 1, 0 ); _layout->addWidget( _tabbar, 1, 1 ); ! /* KDE 3.2 error, inserting a new spacer item to fix the left justification bug */ ! _layout->addItem( new QSpacerItem(0,0, QSizePolicy::Expanding, QSizePolicy::Minimum), 1, 2 ); ! _layout->addWidget( _closeTab, 1, 3 ); if (HIDE_ON_SINGLE_TAB) HIDE |
|
From: Karai C. <ck...@us...> - 2004-04-14 20:51:50
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32594/krusader_kde3 Modified Files: ChangeLog Log Message: FIXED: paneltabs are justified to right in KDE 3.2 Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.202 retrieving revision 1.203 diff -C2 -d -r1.202 -r1.203 *** ChangeLog 12 Apr 2004 11:37:52 -0000 1.202 --- ChangeLog 14 Apr 2004 20:51:41 -0000 1.203 *************** *** 1,2 **** --- 1,6 ---- + FIXED: KDE 3.2 panels are justified to right + FIXED: dragging over a new tab changes active tab + FIXED: crash at pressing space on the '..' directory + 1.40-beta1 ====================== |
|
From: Shie E. <er...@us...> - 2004-04-14 13:05:08
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29462/krusader Modified Files: paneltabbar.h Log Message: fix: dragging over a new tab changes active tab Index: paneltabbar.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** paneltabbar.h 18 Oct 2003 12:39:46 -0000 1.5 --- paneltabbar.h 14 Apr 2004 13:04:57 -0000 1.6 *************** *** 82,85 **** --- 82,87 ---- void insertAction( KAction* ); QString squeeze(QString text); + virtual void dragEnterEvent(QDragEnterEvent *); + virtual void dragMoveEvent(QDragMoveEvent *); protected slots: |
|
From: Shie E. <er...@us...> - 2004-04-14 13:00:55
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28553/krusader Modified Files: paneltabbar.cpp Log Message: fix: dragging over a new tab changes active tab Index: paneltabbar.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** paneltabbar.cpp 24 Oct 2003 17:01:07 -0000 1.6 --- paneltabbar.cpp 14 Apr 2004 13:00:44 -0000 1.7 *************** *** 32,35 **** --- 32,36 ---- _panelActionMenu = new KActionMenu( i18n("Panel"), this ); + setAcceptDrops(true); insertAction(krNewTab); insertAction(krDupTab); *************** *** 190,193 **** --- 191,211 ---- } + void PanelTabBar::dragEnterEvent(QDragEnterEvent *e) { + QTab *t = selectTab(e->pos()); + if (!t) return; + if (tab(currentTab()) != t) { + setCurrentTab(t); + emit changePanel(dynamic_cast<PanelTab*>(t)->panel); + } + } + + void PanelTabBar::dragMoveEvent(QDragMoveEvent *e) { + QTab *t = selectTab(e->pos()); + if (!t) return; + if (tab(currentTab()) != t) { + setCurrentTab(t); + emit changePanel(dynamic_cast<PanelTab*>(t)->panel); + } + } // -----------------------------> PanelTab <---------------------------- |
|
From: Shie E. <er...@us...> - 2004-04-14 12:18:55
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20629/krusader/Panel Modified Files: krdetailedview.cpp Log Message: fix: don't allow calcspace on ".." Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** krdetailedview.cpp 1 Apr 2004 22:07:40 -0000 1.70 --- krdetailedview.cpp 14 Apr 2004 12:18:43 -0000 1.71 *************** *** 747,751 **** case Key_Space : { KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( getCurrentKrViewItem() ); ! if ( !viewItem || !( viewItem->isDir() && viewItem->size() <= 0 ) ) { KListView::keyPressEvent( new QKeyEvent( QKeyEvent::KeyPress, Key_Space, 0, 0 ) ); return ; // wrong type, just mark(unmark it) --- 747,751 ---- case Key_Space : { KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( getCurrentKrViewItem() ); ! if ( !viewItem || !( viewItem->isDir() && viewItem->size() <= 0 ) || viewItem->name()==".." ) { KListView::keyPressEvent( new QKeyEvent( QKeyEvent::KeyPress, Key_Space, 0, 0 ) ); return ; // wrong type, just mark(unmark it) |
|
From: Shie E. <er...@us...> - 2004-04-12 11:51:43
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508 Modified Files: ChangeLog README configure.in.in krusader.kdevprj Log Message: updated version number for 1.40-beta1 Index: README =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/README,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** README 29 Mar 2004 19:31:04 -0000 1.15 --- README 12 Apr 2004 11:37:52 -0000 1.16 *************** *** 1,19 **** ! krusader-cvs-Unstable ! ===================== ! A list of new features compared to the latest stable (which was 1.30): ! ! * panel level toolbar ('..', '/', '~', '=' buttons), thanks to David Harel ! * new konfigurator with many new configuration options - thanks to Csaba ! * new quicksearch (like TC) - thanks to Heiner ! * calculate occupied space prints the directory's size (like TC) - thanks to Heiner ! * KrSearch edit/view file in the result list window with (F3, F4, right click) ! * a folder-history button (like TC) - thanks to Hans Loffler! ! * a working user menu, but a bit rough on the edges - thanks to Shie ! * directory synchronizer - thanks to Csaba ! * file splitter and combiner - thanks to Csaba ! * ... ! Read the ChangeLog file to see more changes. Notice: if you've got bugs to report, please do it using krusader's website, and not using KDE's bugzilla (bugs.kde.org). --- 1,39 ---- ! Krusader 1.40-beta1 ! =================== ! Finally, it's here. This beta is the first in the 1.40 series. A lot has happened ! since 1.30, and we're quite execited over 1.40, and hope you are too. ! Some of the big changes are: ! * new icons for krusader (thanks to adios for providing them) ! * configuring the colors of the panel ! * quickmode for mountman. press and HOLD the mountman icon for new functionality ! * ability to enable/disable icons in the views (filelists) ! * Konfigurator was re-written by Csaba, and has lots of new things in it. ! * Ability to configure the fields of the panel (Ext, Size, Perm, ...) ! * Single click selection mode ! * Panel level toolbar ('..', '/', '~', '=' buttons), thanks to David Harel ! * A Locate frontend (integrating the findutils-locate package of GNU into Krusader). TEST IT ! * A Quicksearch a-la totalCommander. Thanks to heiner. ! * Ability to edit/view file in the search result window (F3, F4, right click) ! * A folder-history button, a-la-total commander. thanks to Hans Loffler! ! * A directory synchronizer (thanks to Csaba). TEST IT ! * A file splitter module ! Also, many bugs have been fixed, including: ! * internal editor quits without notification even if the edited file was not saved ! * KDE 3.2 terminal exit at Ctrl+C ! * bug [ 906386 ] regarding refreshes of dirwatch with fam enabled ! * bug [ 906538 ] which now makes a faster unpacking process ! * bug [ 894771 ] regarding over-expanding window due to long command line ! * permission handling for FTP URL-s ! * no restart at changing the icon tray's state in konfigurator ! * krusader freezes if the `df` process does not terminate (at network errors, IO wait) ! * increased speed of search, by emitting lesssignals (thanks to Lars) ! * statusbar updated only on mouse clicks, not on keyboard ! * crash at rename if the directory is refreshed by the watcher ! * crash at ftp://user@server@proxy:port FTP URL-s ! * no parent directory at tar://... and zip://... URL-s Read the ChangeLog file to see more changes. + As you can see, a lot has happened, and we need help to test it. + Notice: if you've got bugs to report, please do it using krusader's website, and not using KDE's bugzilla (bugs.kde.org). *************** *** 52,56 **** When you install a Krusader cvs or beta version and if Krusader was previously installed on your computer, there is a possibility that you will have to update ! the krusaderui.rc file. please read the faq's for more info. --- 72,76 ---- When you install a Krusader cvs or beta version and if Krusader was previously installed on your computer, there is a possibility that you will have to update ! the krusaderui.rc file. please read the faq's for more info. *************** *** 122,126 **** Download the latest available version of Krusader with a checkout from CVS. Or if you are not familiar with CVS, download the latest Krusader CVS ! sourcecode snapshot (nightly tarball) from http://krusader.sourceforge.net/index.php?nav=cvs.php --- 142,146 ---- Download the latest available version of Krusader with a checkout from CVS. Or if you are not familiar with CVS, download the latest Krusader CVS ! sourcecode snapshot (nightly tarball) from http://krusader.sourceforge.net/index.php?nav=cvs.php Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -C2 -d -r1.201 -r1.202 *** ChangeLog 10 Apr 2004 08:56:36 -0000 1.201 --- ChangeLog 12 Apr 2004 11:37:52 -0000 1.202 *************** *** 1,2 **** --- 1,4 ---- + 1.40-beta1 + ====================== ADDED: configuring the colors of the panel ADDED: (a bug fix really) ability to "not test archives before unpacking" Index: configure.in.in =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/configure.in.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** configure.in.in 14 Nov 2003 16:22:21 -0000 1.16 --- configure.in.in 12 Apr 2004 11:37:52 -0000 1.17 *************** *** 1,5 **** #MIN_CONFIG(3) ! AM_INIT_AUTOMAKE(krusader,1.30) dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ --- 1,5 ---- #MIN_CONFIG(3) ! AM_INIT_AUTOMAKE(krusader,1.40-beta1) dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ Index: krusader.kdevprj =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader.kdevprj,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** krusader.kdevprj 24 Mar 2004 06:33:53 -0000 1.53 --- krusader.kdevprj 12 Apr 2004 11:37:52 -0000 1.54 *************** *** 24,28 **** cxxflags=\s-O0 -Wall ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ! ldflags=\s \s [General] --- 24,28 ---- cxxflags=\s-O0 -Wall ldadd=UserMenu/libUserMenu.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ! ldflags=\s \s [General] *************** *** 40,44 **** short_info= sub_dir=krusader/ ! version=1.30 version_control=None workspace=1 --- 40,44 ---- short_info= sub_dir=krusader/ ! version=1.40-beta1 version_control=None workspace=1 |
|
From: Karai C. <ck...@us...> - 2004-04-10 09:10:05
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25820/krusader_kde3 Modified Files: ChangeLog Log Message: FIXED: krusader exits at closing the viewer when minimized to tray Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 *** ChangeLog 7 Apr 2004 05:55:43 -0000 1.200 --- ChangeLog 10 Apr 2004 08:56:36 -0000 1.201 *************** *** 25,28 **** --- 25,29 ---- ADDED: file splitter ADDED: a missing credit for Frank in the about box + FIXED: krusader exits at closing the viewer when minimized to tray FIXED: KDE 3.2 terminal exit at Ctrl+C FIXED: bug [ 906386 ] regarding refreshes of dirwatch with fam enabled |
|
From: Karai C. <ck...@us...> - 2004-04-10 09:10:05
|
Update of /cvsroot/krusader/krusader_kde3/krusader/KViewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25820/krusader_kde3/krusader/KViewer Modified Files: krviewer.cpp krviewer.h Log Message: FIXED: krusader exits at closing the viewer when minimized to tray Index: krviewer.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** krviewer.cpp 17 Mar 2004 06:24:10 -0000 1.15 --- krviewer.cpp 10 Apr 2004 08:56:37 -0000 1.16 *************** *** 42,45 **** --- 42,46 ---- KrViewer::KrViewer(QWidget *parent, const char *name ) : KParts::MainWindow(parent,name), manager(this,this){ + //setWFlags(WType_TopLevel | WDestructiveClose); setXMLFile("krviewerui.rc"); *************** *** 344,345 **** --- 345,353 ---- } } + + bool KrViewer::queryExit() + { + kapp->ref(); // FIX: krusader exits at closing the viewer when minimized to tray + return true; // don't let the reference counter reach zero + } + Index: krviewer.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krviewer.h 23 Dec 2003 19:08:14 -0000 1.6 --- krviewer.h 10 Apr 2004 08:56:37 -0000 1.7 *************** *** 54,57 **** --- 54,58 ---- protected: virtual bool queryClose(); + virtual bool queryExit(); private: |
|
From: Karai C. <ck...@us...> - 2004-04-07 06:08:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9845/krusader_kde3/krusader/Panel Modified Files: listpanel.cpp panelfunc.cpp Log Message: FIXED: KDE 3.2 terminal exits for Ctrl+C (workaround) Index: panelfunc.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** panelfunc.cpp 15 Mar 2004 14:40:29 -0000 1.60 --- panelfunc.cpp 7 Apr 2004 05:55:45 -0000 1.61 *************** *** 255,258 **** --- 255,265 ---- QString term = krConfig->readEntry( "Terminal", _Terminal ); proc << KrServices::separateArgs( term ); + + if( term.contains( "konsole" ) ) /* KDE 3.2 bug (konsole is killed by pressing Ctrl+C) */ + { /* Please remove the patch if the bug is corrected */ + proc << "&"; + proc.setUseShell( true ); + } + if ( !proc.start( KProcess::DontCare ) ) KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + term + "\"" ); Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** listpanel.cpp 29 Mar 2004 21:00:45 -0000 1.57 --- listpanel.cpp 7 Apr 2004 05:55:45 -0000 1.58 *************** *** 766,769 **** --- 766,776 ---- if ( !item->isDir() ) proc << "-e" << item->name(); + + if( term.contains( "konsole" ) ) /* KDE 3.2 bug (konsole is killed by pressing Ctrl+C) */ + { /* Please remove the patch if the bug is corrected */ + proc << "&"; + proc.setUseShell( true ); + } + if ( !proc.start( KProcess::DontCare ) ) KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + term + "\"" ); |
|
From: Karai C. <ck...@us...> - 2004-04-07 06:08:43
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9845/krusader_kde3 Modified Files: ChangeLog Log Message: FIXED: KDE 3.2 terminal exits for Ctrl+C (workaround) Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.199 retrieving revision 1.200 diff -C2 -d -r1.199 -r1.200 *** ChangeLog 24 Mar 2004 06:33:53 -0000 1.199 --- ChangeLog 7 Apr 2004 05:55:43 -0000 1.200 *************** *** 25,28 **** --- 25,29 ---- ADDED: file splitter ADDED: a missing credit for Frank in the about box + FIXED: KDE 3.2 terminal exit at Ctrl+C FIXED: bug [ 906386 ] regarding refreshes of dirwatch with fam enabled FIXED: bug [ 906538 ] which now makes a faster unpacking process |
|
From: Karai C. <ck...@us...> - 2004-04-07 06:08:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9845/krusader_kde3/krusader Modified Files: krslots.cpp Log Message: FIXED: KDE 3.2 terminal exits for Ctrl+C (workaround) Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** krslots.cpp 9 Mar 2004 22:59:52 -0000 1.50 --- krslots.cpp 7 Apr 2004 05:55:44 -0000 1.51 *************** *** 379,392 **** void KRslots::homeTerminal(){ QString save = getcwd(0,0); ! chdir (QDir::homeDirPath().local8Bit()); KProcess proc; ! krConfig->setGroup("General"); ! QString term = krConfig->readEntry("Terminal",_Terminal); ! proc << KrServices::separateArgs( term ); ! if(!proc.start(KProcess::DontCare)) ! KMessageBox::sorry(krApp,i18n("Can't open ")+"\""+term+"\""); ! chdir(save.local8Bit()); } --- 379,399 ---- void KRslots::homeTerminal(){ QString save = getcwd(0,0); ! chdir (QDir::homeDirPath().local8Bit()); KProcess proc; ! krConfig->setGroup("General"); ! QString term = krConfig->readEntry("Terminal",_Terminal); ! proc << KrServices::separateArgs( term ); ! ! if( term.contains( "konsole" ) ) /* KDE 3.2 bug (konsole is killed by pressing Ctrl+C) */ ! { /* Please remove the patch if the bug is corrected */ ! proc << "&"; ! proc.setUseShell( true ); ! } ! ! if(!proc.start(KProcess::DontCare)) ! KMessageBox::sorry(krApp,i18n("Can't open ")+"\""+term+"\""); ! chdir(save.local8Bit()); } |
|
From: Karai C. <ck...@us...> - 2004-04-05 07:21:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16420/krusader_kde3/krusader/GUI Modified Files: kcmdline.cpp Log Message: FIXED: commandline resizes the main window Index: kcmdline.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** kcmdline.cpp 20 Mar 2004 11:34:38 -0000 1.20 --- kcmdline.cpp 5 Apr 2004 07:08:47 -0000 1.21 *************** *** 111,115 **** void KCMDLine::setCurrent( const QString &p ) { ! path->setText( p + ">" ); completion.setDir( p ); // make sure our command is executed in the right directory --- 111,130 ---- void KCMDLine::setCurrent( const QString &p ) { ! ! QString pathName = p; ! QFontMetrics fm(path->fontMetrics()); ! int textWidth = fm.width(pathName); ! int maxWidth = ( cmdLine->width() + path->width() ) * 2 / 5; ! int letters = p.length() / 2; ! ! while ( letters && textWidth > maxWidth ) ! { ! pathName = p.left( letters ) + "..." + p.right( letters ); ! letters--; ! textWidth = fm.width(pathName); ! } ! ! path->setText( pathName + ">" ); ! completion.setDir( p ); // make sure our command is executed in the right directory |
|
From: Karai C. <ck...@us...> - 2004-04-04 23:21:33
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Search In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6992/krusader_kde3/krusader/Search Modified Files: krsearchdialogbase.cpp krsearchdialogbase.h Log Message: FIXED: search window resize bug Index: krsearchdialogbase.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krsearchdialogbase.h 1 Oct 2003 13:17:50 -0000 1.3 --- krsearchdialogbase.h 4 Apr 2004 23:09:01 -0000 1.4 *************** *** 19,22 **** --- 19,23 ---- class KComboBox; class KLineEdit; + class KSqueezedTextLabel; class QButtonGroup; class QCheckBox; *************** *** 119,123 **** QWidget* tab_3; QLabel* foundLabel; ! QLabel* searchingLabel; QListView* resultsList; --- 120,124 ---- QWidget* tab_3; QLabel* foundLabel; ! KSqueezedTextLabel* searchingLabel; QListView* resultsList; Index: krsearchdialogbase.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** krsearchdialogbase.cpp 20 Mar 2004 10:25:08 -0000 1.9 --- krsearchdialogbase.cpp 4 Apr 2004 23:09:01 -0000 1.10 *************** *** 12,15 **** --- 12,16 ---- #include <kcombobox.h> #include <klineedit.h> + #include <ksqueezedtextlabel.h> #include <qbuttongroup.h> #include <qcheckbox.h> *************** *** 192,197 **** if ( !name ) setName( "KrSearchBase" ); ! resize( 596, 476 ); ! setMaximumHeight(476); setMaximumWidth(596); setCaption( i18n( "Krusader::Search" ) ); KrSearchBaseLayout = new QGridLayout( this ); --- 193,198 ---- if ( !name ) setName( "KrSearchBase" ); ! // resize( 596, 476 ); ! // setMaximumHeight(476); setMaximumWidth(596); setCaption( i18n( "Krusader::Search" ) ); KrSearchBaseLayout = new QGridLayout( this ); *************** *** 716,721 **** Layout11->addWidget( foundLabel ); ! searchingLabel = new QLabel( tab_3, "searchingLabel" ); ! searchingLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1, searchingLabel->sizePolicy().hasHeightForWidth() ) ); searchingLabel->setFrameShape( QLabel::StyledPanel ); searchingLabel->setFrameShadow( QLabel::Sunken ); --- 717,722 ---- Layout11->addWidget( foundLabel ); ! searchingLabel = new KSqueezedTextLabel( tab_3, "searchingLabel" ); ! // searchingLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1, searchingLabel->sizePolicy().hasHeightForWidth() ) ); searchingLabel->setFrameShape( QLabel::StyledPanel ); searchingLabel->setFrameShadow( QLabel::Sunken ); |
|
From: Karai C. <ck...@us...> - 2004-04-04 22:18:11
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27493/krusader_kde3/krusader/MountMan Modified Files: kmountman.cpp Log Message: FIXED: df maximum waiting time is 60s Index: kmountman.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** kmountman.cpp 5 Mar 2004 20:05:21 -0000 1.21 --- kmountman.cpp 4 Apr 2004 22:05:30 -0000 1.22 *************** *** 64,68 **** #endif ! #define DF_WAIT_TIME 30 bool dfStartFailed = false; --- 64,68 ---- #endif ! #define DF_WAIT_TIME 60 bool dfStartFailed = false; |
|
From: Karai C. <ck...@us...> - 2004-04-01 22:19:56
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22497/krusader_kde3/krusader/Panel Modified Files: krcolorcache.cpp krcolorcache.h krdetailedview.cpp krdetailedviewitem.cpp krdetailedviewitem.h Log Message: ADDED: color configuration, feature complete Index: krdetailedviewitem.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** krdetailedviewitem.cpp 29 Mar 2004 21:00:45 -0000 1.25 --- krdetailedviewitem.cpp 1 Apr 2004 22:07:40 -0000 1.26 *************** *** 47,51 **** #include <kdebug.h> #include <kmimetype.h> - #include <kglobalsettings.h> KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, QListViewItem *after, vfile *vf): --- 47,50 ---- *************** *** 194,263 **** // begin of custom color calculation - bool markCurrentAlways = KrColorCache::getColorCache().isShowCurrentItemAlways(); // if KDE deafault: do not touch color group! if (!KrColorCache::getColorCache().isKDEDefault()) { bool isActive = (dynamic_cast<KrView *>(listView()) == krApp->mainView->activePanel->view); bool isCurrent = listView()->currentItem() == this; ! // As i deal with pointers here, the KDE default colors have to be stored here so that I can make ! // a pointer out of it ! QColor defaultForeground = KGlobalSettings::textColor(), defaultBackground = KGlobalSettings::alternateBackgroundColor(), ! defaultMarkedForeground = KGlobalSettings::highlightedTextColor(), defaultMarkedBackground = KGlobalSettings::highlightColor(); ! ! // These two pointers will take the fore and background color. Color is a temp variable ! const QColor * foreground = & defaultForeground, * background = & defaultBackground, * color; ! ! if (isAlternate() || !defaultBackground.isValid()) ! defaultBackground = KGlobalSettings::baseColor(); ! ! // Macro: set target = col, if col is not zero ! #define SETCOLOR(target, col) { color = col; if (color) target = color; } ! ! // First calculate fore and background. Th eKDe deafult is not taken into account here ! SETCOLOR(background, isAlternate()?KrColorCache::getColorCache().getAlternateBackgroundColor(isActive):KrColorCache::getColorCache().getBackgroundColor(isActive)) ! SETCOLOR(foreground, KrColorCache::getColorCache().getForegroundColor(isActive)) if (isSymLink()) { if (_vf->vfile_getMime() == "Broken Link !" ) ! SETCOLOR(foreground, KrColorCache::getColorCache().getInvalidSymlinkForegroundColor(isActive)) else ! SETCOLOR(foreground, KrColorCache::getColorCache().getSymlinkForegroundColor(isActive)) } else if (isDir()) ! SETCOLOR(foreground, KrColorCache::getColorCache().getDirectoryForegroundColor(isActive)) else if (isExecutable()) ! SETCOLOR(foreground, KrColorCache::getColorCache().getExecutableForegroundColor(isActive)) // set the background color ! _cg.setColor(QColorGroup::Base, *background); ! _cg.setColor(QColorGroup::Background, *background); // set the foreground color ! _cg.setColor(QColorGroup::Text, *foreground); // now the color of a marked item ! const QColor * markedForeground = &defaultMarkedForeground, * markedBackground = &defaultMarkedBackground; ! ! // Seek the correct background color. Set it as marked background, if it is defined. ! SETCOLOR(markedBackground, KrColorCache::getColorCache().getMarkedBackgroundColor(isActive)) ! ! if (isAlternate()) ! { ! // Now set it as alternate marked background, if it is defined. As the result the alternate marked background ! // has a higher priority than the marked background, which has a higher priority than the KDe default. ! SETCOLOR(markedBackground, KrColorCache::getColorCache().getAlternateMarkedBackgroundColor(isActive)) ! } ! // set it in the color group (different group color than normal background!) ! _cg.setColor(QColorGroup::Highlight, *markedBackground); ! ! if (KrColorCache::getColorCache().getTextValue("Marked Foreground") == "transparent") markedForeground = setColorIfContrastIsSufficient(markedBackground, foreground, background); ! else ! SETCOLOR(markedForeground, KrColorCache::getColorCache().getMarkedForegroundColor(isActive)) // set it in the color group (different group color than normal foreground!) ! _cg.setColor(QColorGroup::HighlightedText, *markedForeground); ! // In case the current item is a selected one, set the fore- and background colors for the contrast calculation below if (isSelected()) --- 193,239 ---- // begin of custom color calculation // if KDE deafault: do not touch color group! if (!KrColorCache::getColorCache().isKDEDefault()) { + bool markCurrentAlways = KrColorCache::getColorCache().isShowCurrentItemAlways(); bool isActive = (dynamic_cast<KrView *>(listView()) == krApp->mainView->activePanel->view); bool isCurrent = listView()->currentItem() == this; ! // First calculate fore- and background. ! QColor background = isAlternate()?KrColorCache::getColorCache().getAlternateBackgroundColor(isActive):KrColorCache::getColorCache().getBackgroundColor(isActive); ! QColor foreground; if (isSymLink()) { if (_vf->vfile_getMime() == "Broken Link !" ) ! foreground = KrColorCache::getColorCache().getInvalidSymlinkForegroundColor(isActive); else ! foreground = KrColorCache::getColorCache().getSymlinkForegroundColor(isActive); } else if (isDir()) ! foreground = KrColorCache::getColorCache().getDirectoryForegroundColor(isActive); else if (isExecutable()) ! foreground = KrColorCache::getColorCache().getExecutableForegroundColor(isActive); ! else ! foreground = KrColorCache::getColorCache().getForegroundColor(isActive); // set the background color ! _cg.setColor(QColorGroup::Base, background); ! _cg.setColor(QColorGroup::Background, background); // set the foreground color ! _cg.setColor(QColorGroup::Text, foreground); // now the color of a marked item ! QColor markedBackground = isAlternate()?KrColorCache::getColorCache().getAlternateMarkedBackgroundColor(isActive):KrColorCache::getColorCache().getMarkedBackgroundColor(isActive); ! QColor markedForeground = KrColorCache::getColorCache().getMarkedForegroundColor(isActive); ! if (!markedForeground.isValid()) // transparent ! // choose fore- or background, depending on its contrast compared to markedBackground markedForeground = setColorIfContrastIsSufficient(markedBackground, foreground, background); ! // set it in the color group (different group color than normal foreground!) ! _cg.setColor(QColorGroup::HighlightedText, markedForeground); ! _cg.setColor(QColorGroup::Highlight, markedBackground); ! // In case the current item is a selected one, set the fore- and background colors for the contrast calculation below if (isSelected()) *************** *** 269,299 **** // finally the current item if (isCurrent && (markCurrentAlways || isActive)) { ! // if this is the current item AND the panels has tho focus OR the current should be marked always ! const QColor * currentBackground = background; ! SETCOLOR(currentBackground, KrColorCache::getColorCache().getCurrentBackgroundColor(isActive)) ! // set the background, if defined ! _cg.setColor(QColorGroup::Highlight, *currentBackground); ! _cg.setColor(QColorGroup::Base, *currentBackground); ! _cg.setColor(QColorGroup::Background, *currentBackground); ! color = KrColorCache::getColorCache().getCurrentForegroundColor(isActive); ! if (color) ! { ! // set the foreground, if defined ! _cg.setColor(QColorGroup::Text, *color); ! _cg.setColor(QColorGroup::HighlightedText, *color); ! } ! else ! { ! // if no foreground color is set, the foreground color calculated above is used. This might give an ! // 'invisible' color, if the foreground color calulated above and the background color of the current ! // item are very similar. Calulate the contrast to identify such a problem. ! color = setColorIfContrastIsSufficient(currentBackground, foreground, background); ! _cg.setColor(QColorGroup::Text, *color); ! _cg.setColor(QColorGroup::HighlightedText, *color); ! } } - } --- 245,268 ---- // finally the current item if (isCurrent && (markCurrentAlways || isActive)) + // if this is the current item AND the panels has tho focus OR the current should be marked always { ! QColor currentBackground = KrColorCache::getColorCache().getCurrentBackgroundColor(isActive); ! if (!currentBackground.isValid()) // transparent ! currentBackground = background; ! ! // set the background ! _cg.setColor(QColorGroup::Highlight, currentBackground); ! _cg.setColor(QColorGroup::Base, currentBackground); ! _cg.setColor(QColorGroup::Background, currentBackground); ! QColor color = KrColorCache::getColorCache().getCurrentForegroundColor(isActive); ! if (!color.isValid()) // transparent ! // choose fore- or background, depending on its contrast compared to markedBackground ! color = setColorIfContrastIsSufficient(currentBackground, foreground, background); ! ! // set the foreground ! _cg.setColor(QColorGroup::Text, color); ! _cg.setColor(QColorGroup::HighlightedText, color); } } *************** *** 308,318 **** } ! const QColor * KrDetailedViewItem::setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2) { #define sqr(x) ((x)*(x)) ! int contrast = sqr(color1->red() - background->red()) + sqr(color1->green() - background->green()) + sqr(color1->blue() - background->blue()); ! // if the contrst is too small, take the background of the not current item as its foreground in the hope, ! // that this increases teh contrast. if (contrast < 1000) return color2; --- 277,286 ---- } ! const QColor & KrDetailedViewItem::setColorIfContrastIsSufficient(const QColor & background, const QColor & color1, const QColor & color2) { #define sqr(x) ((x)*(x)) ! int contrast = sqr(color1.red() - background.red()) + sqr(color1.green() - background.green()) + sqr(color1.blue() - background.blue()); ! // if the contrast between background and color1 is too small, take color2 instead. if (contrast < 1000) return color2; *************** *** 320,324 **** } - QPixmap& KrDetailedViewItem::icon() { QPixmap *p; --- 288,291 ---- Index: krdetailedviewitem.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** krdetailedviewitem.h 26 Mar 2004 08:17:18 -0000 1.14 --- krdetailedviewitem.h 1 Apr 2004 22:07:40 -0000 1.15 *************** *** 82,86 **** // used INTERNALLY when calculation of dir size changes the displayed size of the item inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); } ! static const QColor * setColorIfContrastIsSufficient(const QColor * background, const QColor * color1, const QColor * color2); QGuardedPtr<vfile> _vf; --- 82,86 ---- // used INTERNALLY when calculation of dir size changes the displayed size of the item inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); } ! static const QColor & setColorIfContrastIsSufficient(const QColor & background, const QColor & color1, const QColor & color2); QGuardedPtr<vfile> _vf; Index: krcolorcache.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krcolorcache.cpp 29 Mar 2004 21:00:45 -0000 1.3 --- krcolorcache.cpp 1 Apr 2004 22:07:40 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- #include "../krusader.h" #include "../defaults.h" + #include <kglobalsettings.h> *************** *** 65,75 **** } ! const QColor * KrColorCache::getColor(const QString & colorName) const { QColor * color = colorCache.find(colorName); if (!color) { - krConfig->setGroup("Colors"); color = new QColor(); *color = krConfig->readColorEntry(colorName); ((KrColorCache *)this)->colorCache.replace(colorName, color); --- 66,76 ---- } ! const QColor & KrColorCache::getColor(const QString & colorName) const { QColor * color = colorCache.find(colorName); if (!color) { color = new QColor(); + krConfig->setGroup("Colors"); *color = krConfig->readColorEntry(colorName); ((KrColorCache *)this)->colorCache.replace(colorName, color); *************** *** 77,155 **** ((KrColorCache *)this)->colorCache.resize(colorCache.count()*2+1); } ! if (color->isValid()) ! return color; ! return 0; } ! const QColor * KrColorCache::getForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Foreground"); ! return color?color:getColor("Foreground"); } ! const QColor * KrColorCache::getDirectoryForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Directory Foreground"); ! return color?color:getColor("Directory Foreground"); } ! const QColor * KrColorCache::getExecutableForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Executable Foreground"); ! return color?color:getColor("Executable Foreground"); } ! const QColor * KrColorCache::getSymlinkForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Symlink Foreground"); ! return color?color:getColor("Symlink Foreground"); } ! const QColor * KrColorCache::getInvalidSymlinkForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Invalid Symlink Foreground"); ! return color?color:getColor("Invalid Symlink Foreground"); } ! const QColor * KrColorCache::getMarkedForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Marked Foreground"); ! return color?color:getColor("Marked Foreground"); } ! const QColor * KrColorCache::getMarkedBackgroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Marked Background"); ! return color?color:getColor("Marked Background"); } ! const QColor * KrColorCache::getCurrentForegroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Current Foreground"); ! return color?color:getColor("Current Foreground"); } ! const QColor * KrColorCache::getCurrentBackgroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Current Background"); ! return color?color:getColor("Current Background"); } ! const QColor * KrColorCache::getBackgroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Background"); ! return color?color:getColor("Background"); } ! const QColor * KrColorCache::getAlternateBackgroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Alternate Background"); ! return color?color:getColor("Alternate Background"); } ! const QColor * KrColorCache::getAlternateMarkedBackgroundColor(bool isActive) const { ! const QColor * color = isActive?0:getColor("Inactive Alternate Marked Background"); ! return color?color:getColor("Alternate Marked Background"); } --- 78,222 ---- ((KrColorCache *)this)->colorCache.resize(colorCache.count()*2+1); } ! return * color; } ! ! // Macro: set target = col, if col is valid ! #define SETCOLOR(target, col) { if (col.isValid()) target = col; } ! ! QColor KrColorCache::getForegroundColor(bool isActive) const { ! QColor color = KGlobalSettings::textColor(); ! SETCOLOR(color, getColor("Foreground")) ! if (!isActive) SETCOLOR(color, getColor("Inactive Foreground")) ! return color; } ! QColor KrColorCache::getDirectoryForegroundColor(bool isActive) const { ! if (!isActive && getTextValue("Inactive Directory Background") == "Inactive Foreground") ! return getForegroundColor(false); ! QColor color = getColor("Directory Foreground"); ! if (!isActive) SETCOLOR(color, getColor("Inactive Directory Foreground")) ! if (!color.isValid()) ! return getForegroundColor(isActive); ! return color; } ! QColor KrColorCache::getExecutableForegroundColor(bool isActive) const { ! if (!isActive && getTextValue("Inactive Executable Background") == "Inactive Foreground") ! return getForegroundColor(false); ! QColor color = getColor("Executable Foreground"); ! if (!isActive) SETCOLOR(color, getColor("Inactive Executable Foreground")) ! if (!color.isValid()) ! return getForegroundColor(isActive); ! return color; } ! QColor KrColorCache::getSymlinkForegroundColor(bool isActive) const { ! if (!isActive && getTextValue("Inactive Symlink Background") == "Inactive Foreground") ! return getForegroundColor(false); ! QColor color = getColor("Symlink Foreground"); ! if (!isActive) SETCOLOR(color, getColor("Inactive Symlink Foreground")) ! if (!color.isValid()) ! return getForegroundColor(isActive); ! return color; } ! QColor KrColorCache::getInvalidSymlinkForegroundColor(bool isActive) const { ! if (!isActive && getTextValue("Inactive Invalid Symlink Background") == "Inactive Foreground") ! return getForegroundColor(false); ! QColor color = getColor("Invalid Symlink Foreground"); ! if (!isActive) SETCOLOR(color, getColor("Inactive Invalid Symlink Foreground")) ! if (!color.isValid()) ! return getForegroundColor(isActive); ! return color; } ! QColor KrColorCache::getMarkedForegroundColor(bool isActive) const { ! QString colorName = isActive?"Marked Foreground":"Inactive Marked Foreground"; ! if (getTextValue(colorName) == "transparent") ! return QColor(); ! if (isActive && getTextValue(colorName) == "") ! return KGlobalSettings::highlightedTextColor(); ! if (!isActive && getTextValue(colorName) == "") ! return getMarkedForegroundColor(true); ! return getColor(colorName); } ! QColor KrColorCache::getMarkedBackgroundColor(bool isActive) const { ! if (isActive && getTextValue("Marked Background") == "") ! return KGlobalSettings::highlightColor(); ! if (isActive && getTextValue("Marked Background") == "Background") ! return getBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Marked Background") == "") ! return getMarkedBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Marked Background") == "Inactive Background") ! return getBackgroundColor(false); ! return isActive?KrColorCache::getColor("Marked Background"):KrColorCache::getColor("Inactive Marked Background"); } ! QColor KrColorCache::getCurrentForegroundColor(bool isActive) const { ! QColor color = getColor("Current Foreground"); ! if (!isActive) SETCOLOR(color, getColor("Inactive Current Foreground")) ! return color; } ! QColor KrColorCache::getCurrentBackgroundColor(bool isActive) const { ! if (isActive && getTextValue("Current Background") == "") ! return QColor(); ! if (isActive && getTextValue("Current Background") == "Background") ! return getBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Current Background") == "") ! return getCurrentBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Current Background") == "Inactive Background") ! return getBackgroundColor(false); ! return isActive?getColor("Current Background"):getColor("Inactive Current Background"); } ! QColor KrColorCache::getBackgroundColor(bool isActive) const { ! QColor color = KGlobalSettings::baseColor(); ! SETCOLOR(color, getColor("Background")) ! if (!isActive) SETCOLOR(color, getColor("Inactive Background")) ! return color; } ! QColor KrColorCache::getAlternateBackgroundColor(bool isActive) const { ! if (isActive && getTextValue("Alternate Background") == "Background") ! return getBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Alternate Background") == "") ! return getAlternateBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Alternate Background") == "Inactive Background") ! return getBackgroundColor(false); ! QColor color = isActive?getColor("Alternate Background"):getColor("Inactive Alternate Background"); ! if (!color.isValid()) ! color = KGlobalSettings::alternateBackgroundColor(); ! if (!color.isValid()) ! color = KGlobalSettings::baseColor(); ! return color; } ! QColor KrColorCache::getAlternateMarkedBackgroundColor(bool isActive) const { ! if (isActive && getTextValue("Alternate Marked Background") == "Alternate Background") ! return getAlternateBackgroundColor(true); ! if (isActive && getTextValue("Alternate Marked Background") == "") ! return getMarkedBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Alternate Marked Background") == "") ! return getAlternateMarkedBackgroundColor(true); ! if (!isActive && getTextValue("Inactive Alternate Marked Background") == "Inactive Alternate Background") ! return getAlternateBackgroundColor(false); ! if (!isActive && getTextValue("Inactive Alternate Marked Background") == "Inactive Marked Background") ! return getMarkedBackgroundColor(false); ! return isActive?KrColorCache::getColor("Alternate Marked Background"):KrColorCache::getColor("Inactive Alternate Marked Background"); } *************** *** 164,165 **** --- 231,233 ---- colorsRefreshed(); } + Index: krcolorcache.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krcolorcache.h 29 Mar 2004 21:00:45 -0000 1.3 --- krcolorcache.h 1 Apr 2004 22:07:40 -0000 1.4 *************** *** 16,32 **** static KrColorCache & getColorCache(); const QString & getTextValue(const QString & textName) const; ! const QColor * getColor(const QString & colorName) const; ! const QColor * getForegroundColor(bool isActive) const; ! const QColor * getDirectoryForegroundColor(bool isActive) const; ! const QColor * getExecutableForegroundColor(bool isActive) const; ! const QColor * getSymlinkForegroundColor(bool isActive) const; ! const QColor * getInvalidSymlinkForegroundColor(bool isActive) const; ! const QColor * getMarkedForegroundColor(bool isActive) const; ! const QColor * getMarkedBackgroundColor(bool isActive) const; ! const QColor * getCurrentForegroundColor(bool isActive) const; ! const QColor * getCurrentBackgroundColor(bool isActive) const; ! const QColor * getBackgroundColor(bool isActive) const; ! const QColor * getAlternateBackgroundColor(bool isActive) const; ! const QColor * getAlternateMarkedBackgroundColor(bool isActive) const; bool isKDEDefault() const {return kdeDefault;} bool isAlternateBackgroundEnabled() const {return alternateBackgroundEnabled;} --- 16,32 ---- static KrColorCache & getColorCache(); const QString & getTextValue(const QString & textName) const; ! const QColor & getColor(const QString & colorName) const; ! QColor getForegroundColor(bool isActive) const; ! QColor getDirectoryForegroundColor(bool isActive) const; ! QColor getExecutableForegroundColor(bool isActive) const; ! QColor getSymlinkForegroundColor(bool isActive) const; ! QColor getInvalidSymlinkForegroundColor(bool isActive) const; ! QColor getMarkedForegroundColor(bool isActive) const; ! QColor getMarkedBackgroundColor(bool isActive) const; ! QColor getCurrentForegroundColor(bool isActive) const; ! QColor getCurrentBackgroundColor(bool isActive) const; ! QColor getBackgroundColor(bool isActive) const; ! QColor getAlternateBackgroundColor(bool isActive) const; ! QColor getAlternateMarkedBackgroundColor(bool isActive) const; bool isKDEDefault() const {return kdeDefault;} bool isAlternateBackgroundEnabled() const {return alternateBackgroundEnabled;} Index: krdetailedview.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** krdetailedview.cpp 29 Mar 2004 21:00:45 -0000 1.69 --- krdetailedview.cpp 1 Apr 2004 22:07:40 -0000 1.70 *************** *** 40,44 **** #include "listpanel.h" #include "panelfunc.h" - #include <kconfigbase.h> #include <qlayout.h> #include <qdir.h> --- 40,43 ---- *************** *** 959,966 **** if (krApp->mainView && krApp->mainView->activePanel && krApp->mainView->activePanel->view) isActive = (dynamic_cast<KrView *>(this) == krApp->mainView->activePanel->view); ! const QColor * color = KrColorCache::getColorCache().getBackgroundColor(isActive); ! setPaletteBackgroundColor(color?*color:KGlobalSettings::baseColor()); color = KrColorCache::getColorCache().getAlternateBackgroundColor(isActive); ! setAlternateBackground(color?*color:KGlobalSettings::alternateBackgroundColor()); } else --- 958,965 ---- if (krApp->mainView && krApp->mainView->activePanel && krApp->mainView->activePanel->view) isActive = (dynamic_cast<KrView *>(this) == krApp->mainView->activePanel->view); ! QColor color = KrColorCache::getColorCache().getBackgroundColor(isActive); ! setPaletteBackgroundColor(color); color = KrColorCache::getColorCache().getAlternateBackgroundColor(isActive); ! setAlternateBackground(color); } else |
|
From: Karai C. <ck...@us...> - 2004-04-01 22:19:42
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22497/krusader_kde3/krusader/Konfigurator Modified Files: kgcolors.cpp kgcolors.h konfiguratoritems.cpp Log Message: ADDED: color configuration, feature complete Index: konfiguratoritems.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** konfiguratoritems.cpp 26 Mar 2004 08:11:52 -0000 1.10 --- konfiguratoritems.cpp 1 Apr 2004 22:07:40 -0000 1.11 *************** *** 760,763 **** --- 760,764 ---- void KonfiguratorColorChooser::slotSetDefaults(QObject *) { + ext->setChanged(); setCurrentItem( 1 ); emit colorChanged(); Index: kgcolors.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kgcolors.cpp 31 Mar 2004 18:47:25 -0000 1.13 --- kgcolors.cpp 1 Apr 2004 22:07:40 -0000 1.14 *************** *** 66,70 **** connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( generatePreview() ) ); ! connect( generals->find( "Show Current Item Always" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisableCurrent() ) ); kgColorsLayout->addWidget( generalGrp, 0 ,0 ); --- 66,70 ---- connect( generals->find( "KDE Default" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); connect( generals->find( "Enable Alternate Background" ), SIGNAL( stateChanged( int ) ), this, SLOT( generatePreview() ) ); ! connect( generals->find( "Show Current Item Always" ), SIGNAL( stateChanged( int ) ), this, SLOT( slotDisable() ) ); kgColorsLayout->addWidget( generalGrp, 0 ,0 ); *************** *** 97,105 **** addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ), getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" ) ); addColorSelector( "Background", i18n( "Background:" ), KGlobalSettings::baseColor() ); ! ADDITIONAL_COLOR sameAsBckgnd = { i18n("Same as backgound"), getColorSelector( "Background" )->getColor(), "Background" }; addColorSelector( "Alternate Background", i18n( "Alternate background:" ), KGlobalSettings::alternateBackgroundColor(),"", &sameAsBckgnd, 1 ); addColorSelector( "Marked Foreground", i18n( "Marked foreground:" ), KGlobalSettings::highlightedTextColor(), "", &transparent, 1 ); addColorSelector( "Marked Background", i18n( "Marked background:" ), KGlobalSettings::highlightColor(), "", &sameAsBckgnd, 1 ); ! ADDITIONAL_COLOR sameAsAltern = { i18n("Same as alt. backgound"), getColorSelector( "Alternate Background" )->getColor(), "Alternate Background" }; addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" ), &sameAsAltern, 1 ); addColorSelector( "Current Foreground", i18n( "Current foreground:" ), Qt::white, i18n( "Not used" ) ); --- 97,105 ---- addColorSelector( "Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ), getColorSelector( "Foreground" )->getColor(), i18n( "Same as foreground" ) ); addColorSelector( "Background", i18n( "Background:" ), KGlobalSettings::baseColor() ); ! ADDITIONAL_COLOR sameAsBckgnd = { i18n("Same as background"), getColorSelector( "Background" )->getColor(), "Background" }; addColorSelector( "Alternate Background", i18n( "Alternate background:" ), KGlobalSettings::alternateBackgroundColor(),"", &sameAsBckgnd, 1 ); addColorSelector( "Marked Foreground", i18n( "Marked foreground:" ), KGlobalSettings::highlightedTextColor(), "", &transparent, 1 ); addColorSelector( "Marked Background", i18n( "Marked background:" ), KGlobalSettings::highlightColor(), "", &sameAsBckgnd, 1 ); ! ADDITIONAL_COLOR sameAsAltern = { i18n("Same as alt. background"), getColorSelector( "Alternate Background" )->getColor(), "Alternate Background" }; addColorSelector( "Alternate Marked Background",i18n( "Alternate marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as marked background" ), &sameAsAltern, 1 ); addColorSelector( "Current Foreground", i18n( "Current foreground:" ), Qt::white, i18n( "Not used" ) ); *************** *** 121,125 **** addColorSelector( "Inactive Foreground", i18n( "Foreground:" ), getColorSelector( "Foreground" )->getColor(), i18n( "Same as active" ) ); ! ADDITIONAL_COLOR sameAsInactForegnd = { i18n("Same as foregound"), getColorSelector( "Inactive Foreground" )->getColor(), "Inactive Foreground" }; addColorSelector( "Inactive Directory Foreground", i18n( "Directory foreground:" ), getColorSelector( "Directory Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); addColorSelector( "Inactive Executable Foreground", i18n( "Executable foreground:" ), getColorSelector( "Executable Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); --- 121,125 ---- addColorSelector( "Inactive Foreground", i18n( "Foreground:" ), getColorSelector( "Foreground" )->getColor(), i18n( "Same as active" ) ); ! ADDITIONAL_COLOR sameAsInactForegnd = { i18n("Same as foreground"), getColorSelector( "Inactive Foreground" )->getColor(), "Inactive Foreground" }; addColorSelector( "Inactive Directory Foreground", i18n( "Directory foreground:" ), getColorSelector( "Directory Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); addColorSelector( "Inactive Executable Foreground", i18n( "Executable foreground:" ), getColorSelector( "Executable Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); *************** *** 127,136 **** addColorSelector( "Inactive Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ), getColorSelector( "Invalid Symlink Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); addColorSelector( "Inactive Background", i18n( "Background:" ), getColorSelector( "Background" )->getColor(), i18n( "Same as active" ) ); ! ADDITIONAL_COLOR sameAsInactBckgnd = { i18n("Same as backgound"), getColorSelector( "Inactive Background" )->getColor(), "Inactive Background" }; addColorSelector( "Inactive Alternate Background", i18n( "Alternate background:" ), getColorSelector( "Alternate Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 ); addColorSelector( "Inactive Marked Foreground", i18n( "Marked foreground:" ), getColorSelector( "Marked Foreground" )->getColor(), i18n( "Same as active" ), &transparent, 1 ); addColorSelector( "Inactive Marked Background", i18n( "Marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 ); ! ADDITIONAL_COLOR sameAsInactAltern[] = {{ i18n("Same as alt. backgound"), getColorSelector( "Inactive Alternate Background" )->getColor(), "Inactive Alternate Background" }, ! { i18n("Same as marked backgound"), getColorSelector( "Inactive Marked Background" )->getColor(), "Inactive Marked Background" } }; addColorSelector( "Inactive Alternate Marked Background", i18n( "Alternate marked background:" ), getColorSelector( "Alternate Marked Background" )->getColor(), i18n( "Same as active" ), sameAsInactAltern, 2 ); addColorSelector( "Inactive Current Foreground", i18n( "Current foreground:" ), getColorSelector( "Current Foreground" )->getColor(), i18n( "Same as active" ) ); --- 127,136 ---- addColorSelector( "Inactive Invalid Symlink Foreground", i18n( "Invalid symlink foreground:" ), getColorSelector( "Invalid Symlink Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactForegnd, 1 ); addColorSelector( "Inactive Background", i18n( "Background:" ), getColorSelector( "Background" )->getColor(), i18n( "Same as active" ) ); ! ADDITIONAL_COLOR sameAsInactBckgnd = { i18n("Same as background"), getColorSelector( "Inactive Background" )->getColor(), "Inactive Background" }; addColorSelector( "Inactive Alternate Background", i18n( "Alternate background:" ), getColorSelector( "Alternate Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 ); addColorSelector( "Inactive Marked Foreground", i18n( "Marked foreground:" ), getColorSelector( "Marked Foreground" )->getColor(), i18n( "Same as active" ), &transparent, 1 ); addColorSelector( "Inactive Marked Background", i18n( "Marked background:" ), getColorSelector( "Marked Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 ); ! ADDITIONAL_COLOR sameAsInactAltern[] = {{ i18n("Same as alt. background"), getColorSelector( "Inactive Alternate Background" )->getColor(), "Inactive Alternate Background" }, ! { i18n("Same as marked background"), getColorSelector( "Inactive Marked Background" )->getColor(), "Inactive Marked Background" } }; addColorSelector( "Inactive Alternate Marked Background", i18n( "Alternate marked background:" ), getColorSelector( "Alternate Marked Background" )->getColor(), i18n( "Same as active" ), sameAsInactAltern, 2 ); addColorSelector( "Inactive Current Foreground", i18n( "Current foreground:" ), getColorSelector( "Current Foreground" )->getColor(), i18n( "Same as active" ) ); *************** *** 234,246 **** generals->find("Show Current Item Always")->setEnabled( !enabled ); ! slotDisableCurrent(); ! } ! ! void KgColors::slotDisableCurrent() ! { ! bool enabled = generals->find( "Show Current Item Always" )->isChecked(); ! getColorSelector( "Inactive Current Foreground" )->setEnabled( enabled ); ! getColorSelector( "Inactive Current Background" )->setEnabled( enabled ); generatePreview(); --- 234,241 ---- generals->find("Show Current Item Always")->setEnabled( !enabled ); ! enabled = enabled || !generals->find( "Show Current Item Always" )->isChecked(); ! getColorSelector( "Inactive Current Foreground" )->setEnabled( !enabled ); ! getColorSelector( "Inactive Current Background" )->setEnabled( !enabled ); generatePreview(); Index: kgcolors.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kgcolors.h 31 Mar 2004 18:47:25 -0000 1.8 --- kgcolors.h 1 Apr 2004 22:07:40 -0000 1.9 *************** *** 57,61 **** void slotInactiveAltBackgroundChanged(); void slotInactiveMarkedBackgroundChanged(); - void slotDisableCurrent(); void generatePreview(); --- 57,60 ---- |
7 messages has been excluded from this view by a project administrator.
