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: Shie E. <er...@us...> - 2004-10-07 11:50:28
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26206/krusader/BookMan Modified Files: krbookmarkhandler.cpp Log Message: jonas' patch: use krusader's action collection Index: krbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** krbookmarkhandler.cpp 6 Oct 2004 14:42:26 -0000 1.10 --- krbookmarkhandler.cpp 7 Oct 2004 11:50:15 -0000 1.11 *************** *** 21,25 **** KrBookmarkHandler::KrBookmarkHandler(): QObject(0) { // create our own action collection and make the shortcuts apply only to parent ! _collection = new KActionCollection(0, this, "bookmark collection"); // create _root: father of all bookmarks. it is a dummy bookmark and never shown --- 21,26 ---- KrBookmarkHandler::KrBookmarkHandler(): QObject(0) { // create our own action collection and make the shortcuts apply only to parent ! //_collection = new KActionCollection(0, this, "bookmark collection"); ! _collection = krApp->actionCollection(); // create _root: father of all bookmarks. it is a dummy bookmark and never shown |
|
From: Shie E. <er...@us...> - 2004-10-07 11:38:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23417/krusader/Panel Modified Files: krview.h Log Message: removed an unneeded debug print Index: krview.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** krview.h 20 Sep 2004 13:23:56 -0000 1.16 --- krview.h 7 Oct 2004 11:38:15 -0000 1.17 *************** *** 129,133 **** virtual void invertSelection(); virtual QString nameToMakeCurrent() const { return _nameToMakeCurrent; } ! virtual void setNameToMakeCurrent(const QString name) { _nameToMakeCurrent = name; kdWarning() << "!!! " << _nameToMakeCurrent << endl; } virtual QString firstUnmarkedBelowCurrent(); virtual QString statistics(); --- 129,133 ---- virtual void invertSelection(); virtual QString nameToMakeCurrent() const { return _nameToMakeCurrent; } ! virtual void setNameToMakeCurrent(const QString name) { _nameToMakeCurrent = name; } virtual QString firstUnmarkedBelowCurrent(); virtual QString statistics(); |
|
From: Jonas B. <jb...@us...> - 2004-10-06 22:57:32
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7007 Modified Files: ChangeLog Log Message: ADDED: Heiners patch for Current Marked Foreground Color Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.314 retrieving revision 1.315 diff -C2 -d -r1.314 -r1.315 *** ChangeLog 6 Oct 2004 21:17:48 -0000 1.314 --- ChangeLog 6 Oct 2004 22:57:21 -0000 1.315 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: panel costum colors: new Current Marked Foreground ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels |
|
From: Jonas B. <jb...@us...> - 2004-10-06 22:57:32
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7007/krusader/Panel Modified Files: krcolorcache.cpp krcolorcache.h krdetailedviewitem.cpp Log Message: ADDED: Heiners patch for Current Marked Foreground Color Index: krdetailedviewitem.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** krdetailedviewitem.cpp 10 Sep 2004 16:12:56 -0000 1.30 --- krdetailedviewitem.cpp 6 Oct 2004 22:57:20 -0000 1.31 *************** *** 192,195 **** --- 192,196 ---- // begin of custom color calculation + krConfig->setGroup("Colors"); // if KDE deafault: do not touch color group! *************** *** 255,262 **** _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 --- 256,269 ---- _cg.setColor(QColorGroup::Background, currentBackground); ! QColor color; ! if (isSelected()) ! color = KrColorCache::getColorCache().getCurrentMarkedForegroundColor(isActive); ! if (!color.isValid()) // not used ! { ! 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 Index: krcolorcache.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krcolorcache.cpp 1 Apr 2004 22:07:40 -0000 1.4 --- krcolorcache.cpp 6 Oct 2004 22:57:20 -0000 1.5 *************** *** 182,185 **** --- 182,193 ---- } + QColor KrColorCache::getCurrentMarkedForegroundColor(bool isActive) const + { + QString colorName = isActive?"Marked Current Foreground":"Inactive Marked Current Foreground"; + if (getTextValue(colorName) == "") + return QColor(); + return getColor(colorName); + } + QColor KrColorCache::getBackgroundColor(bool isActive) const { Index: krcolorcache.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcolorcache.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krcolorcache.h 1 Apr 2004 22:07:40 -0000 1.4 --- krcolorcache.h 6 Oct 2004 22:57:20 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- QColor getCurrentForegroundColor(bool isActive) const; QColor getCurrentBackgroundColor(bool isActive) const; + QColor getCurrentMarkedForegroundColor(bool isActive) const; QColor getBackgroundColor(bool isActive) const; QColor getAlternateBackgroundColor(bool isActive) const; |
|
From: Jonas B. <jb...@us...> - 2004-10-06 22:57:31
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Konfigurator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7007/krusader/Konfigurator Modified Files: kgcolors.cpp kgcolors.h Log Message: ADDED: Heiners patch for Current Marked Foreground Color Index: kgcolors.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** kgcolors.cpp 1 Apr 2004 22:07:40 -0000 1.14 --- kgcolors.cpp 6 Oct 2004 22:57:20 -0000 1.15 *************** *** 104,107 **** --- 104,109 ---- 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" ) ); + ADDITIONAL_COLOR sameAsMarkedForegnd = { i18n("Same as marked foreground"), getColorSelector( "Marked Foreground" )->getColor(), "Marked Foreground" }; + addColorSelector( "Marked Current Foreground", i18n( "Marked current foreground:" ), Qt::white, i18n( "Not used" ), &sameAsMarkedForegnd, 1); addColorSelector( "Current Background", i18n( "Current background:" ), Qt::white, i18n( "Not used" ), &sameAsBckgnd, 1 ); *************** *** 135,138 **** --- 137,142 ---- 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" ) ); + ADDITIONAL_COLOR sameAsInactMarkedForegnd = { i18n("Same as marked foreground"), getColorSelector( "Inactive Marked Foreground" )->getColor(), "Inactive Marked Foreground" }; + addColorSelector( "Inactive Marked Current Foreground", i18n( "Marked current foreground:" ), getColorSelector( "Marked Current Foreground" )->getColor(), i18n( "Same as active" ), &sameAsInactMarkedForegnd, 1 ); addColorSelector( "Inactive Current Background", i18n( "Current background:" ), getColorSelector( "Current Background" )->getColor(), i18n( "Same as active" ), &sameAsInactBckgnd, 1 ); *************** *** 371,378 **** else { - if( getColorSelector( "Current Foreground" )->currentItem() != 1 ) - currentFore = getColorSelector( "Current Foreground" )->getColor(); if( getColorSelector( "Current Background" )->currentItem() != 1 ) currentBck = getColorSelector( "Current Background" )->getColor(); } --- 375,383 ---- else { if( getColorSelector( "Current Background" )->currentItem() != 1 ) currentBck = getColorSelector( "Current Background" )->getColor(); + if( getColorSelector( "Current Foreground" )->currentItem() != 1 ) + currentFore = getColorSelector( "Current Foreground" )->getColor(); + else currentFore = setColorIfContrastIsSufficient(currentBck, getColorSelector( prefix + "Foreground" )->getColor(), bck); } *************** *** 390,393 **** --- 395,409 ---- } + const QColor & KgColors::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; + return color1; + } + bool KgColors::apply() { Index: kgcolors.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgcolors.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kgcolors.h 1 Apr 2004 22:07:40 -0000 1.9 --- kgcolors.h 6 Oct 2004 22:57:20 -0000 1.10 *************** *** 64,67 **** --- 64,68 ---- KonfiguratorColorChooser *getColorSelector( QString name ); QLabel *getSelectorLabel( QString name ); + const QColor & setColorIfContrastIsSufficient(const QColor & background, const QColor & color1, const QColor & color2); private: |
|
From: Jonas B. <jb...@us...> - 2004-10-06 21:17:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13615/krusader Modified Files: krslots.cpp Log Message: ADDED: compare by content: the action is now smarter in finding the right files Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** krslots.cpp 5 Oct 2004 23:07:46 -0000 1.66 --- krslots.cpp 6 Oct 2004 21:17:47 -0000 1.67 *************** *** 108,127 **** void KRslots::compareContent() { ! QStringList lst1, lst2; ! QString name1, name2; ! ! //((ListPanel*)MAIN_VIEW->left->getSelectedNames(&lst1); ! MAIN_VIEW->left->getSelectedNames(&lst1); ! MAIN_VIEW->right->getSelectedNames(&lst2); ! // first, see if we've got exactly 1 selected file, if not, try the current one ! if (lst1.count() == 1) name1 = lst1[0]; ! if (lst2.count() == 1) name2 = lst2[0]; ! ! if ( name1.isEmpty() || name2.isEmpty() ) { ! // if we got here, then one of the panel can't be sure what file to diff ! KMessageBox::detailedError(0,i18n("Don't know which files to compare."), ! i18n("To compare 2 files by content, select (mark) a file in the left panel, and select another one in the right panel.")); return; } --- 108,141 ---- void KRslots::compareContent() { ! QStringList lstLeft, lstRight; ! QStringList* lstActive; ! KURL name1, name2; ! MAIN_VIEW->left->getSelectedNames( &lstLeft ); ! MAIN_VIEW->right->getSelectedNames( &lstRight ); ! lstActive = ( ACTIVE_PANEL->isLeft() ? &lstLeft : &lstRight ); ! if ( lstLeft.count() == 1 && lstRight.count() == 1 ) { ! // first, see if we've got exactly 1 selected file in each panel: ! name1 = MAIN_VIEW->left->func->files()->vfs_getFile( lstLeft[0] ); ! name2 = MAIN_VIEW->right->func->files()->vfs_getFile( lstRight[0] ); ! } ! else if ( lstActive->count() == 2 ) { ! // next try: are in the current panel exacty 2 files selected? ! name1 = ACTIVE_PANEL->func->files()->vfs_getFile( (*lstActive)[0] ); ! name2 = ACTIVE_PANEL->func->files()->vfs_getFile( (*lstActive)[1] ); ! } ! else if ( ACTIVE_PANEL->otherPanel->func->files()->vfs_search( ACTIVE_PANEL->view->getCurrentItem() ) ) { ! // next try: is in the other panel a file with the same name? ! name1 = ACTIVE_PANEL->func->files()->vfs_getFile( ACTIVE_PANEL->view->getCurrentItem() ); ! name2 = ACTIVE_PANEL->otherPanel->func->files()->vfs_getFile( ACTIVE_PANEL->view->getCurrentItem() ); ! } ! else { ! // if we got here, then we can't be sure what file to diff ! KMessageBox::detailedError(0,i18n("Don't know which files to compare."), ! i18n("To compare 2 files by content, you can either\n" ! "- select (mark) one file in the left panel, and one in the right panel\n" ! "- select exactly two files in the active panel\n" ! "- make sure in the other panel is a file with the same name then the current in the active panel")); return; } *************** *** 129,134 **** // else implied: all ok, let's call kdiff // but if one of the files isn't local, download them first ! compareContent( MAIN_VIEW->left->func->files()->vfs_getFile(name1), ! MAIN_VIEW->right->func->files()->vfs_getFile(name2) ); } --- 143,147 ---- // else implied: all ok, let's call kdiff // but if one of the files isn't local, download them first ! compareContent( name1, name2 ); } |
|
From: Jonas B. <jb...@us...> - 2004-10-06 21:17:58
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13615 Modified Files: CVSNEWS ChangeLog Log Message: ADDED: compare by content: the action is now smarter in finding the right files Index: CVSNEWS =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CVSNEWS 5 Oct 2004 18:51:10 -0000 1.20 --- CVSNEWS 6 Oct 2004 21:17:48 -0000 1.21 *************** *** 4,7 **** --- 4,12 ---- ------------------------------------------------------ + Compare by content: you can no either + - select (mark) one file in the left panel, and one in the right panel + - select exactly two files in the active panel + - make sure in the other panel is a file with the same name then the current in the active panel + Panel profiles: from know it is possible to store environment profiles. An environment profile contains the followings: Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.313 retrieving revision 1.314 diff -C2 -d -r1.313 -r1.314 *** ChangeLog 5 Oct 2004 03:35:47 -0000 1.313 --- ChangeLog 6 Oct 2004 21:17:48 -0000 1.314 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: compare by content: the action is now smarter in finding the right files ADDED: profiles for the panels ADDED: mkdir (F7) can now create whole trees on the fly ("foo/bar/test") |
|
From: Shie E. <er...@us...> - 2004-10-06 14:43:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7814/krusader/BookMan Modified Files: kraddbookmarkdlg.cpp kraddbookmarkdlg.h krbookmark.cpp krbookmarkhandler.cpp krbookmarkhandler.h Log Message: bookman2 is alive! Index: krbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** krbookmarkhandler.cpp 6 Oct 2004 01:02:24 -0000 1.9 --- krbookmarkhandler.cpp 6 Oct 2004 14:42:26 -0000 1.10 *************** *** 9,12 **** --- 9,13 ---- #include <klocale.h> #include <kdebug.h> + #include <kbookmarkmanager.h> #include <kstandarddirs.h> #include <qfile.h> *************** *** 15,19 **** // ------------------------ for internal use ! #define BOOKMARKS_FILE "krusader/bookman2.xml" #define CONNECT_BM(X) connect(X, SIGNAL(activated(const KURL&)), SLOTS, SLOT(refresh(const KURL&))); --- 16,20 ---- // ------------------------ for internal use ! #define BOOKMARKS_FILE "krusader/krbookmarks.xml" #define CONNECT_BM(X) connect(X, SIGNAL(activated(const KURL&)), SLOTS, SLOT(refresh(const KURL&))); *************** *** 27,30 **** --- 28,39 ---- // load bookmarks importFromFile(); + + // hack + manager = KBookmarkManager::managerForFile(locateLocal( "data", BOOKMARKS_FILE ), false); + connect(manager, SIGNAL(changed(const QString&, const QString& )), this, SLOT(bookmarksChanged(const QString&, const QString& ))); + } + + KrBookmarkHandler::~KrBookmarkHandler() { + delete manager; } *************** *** 35,39 **** break; case ManageBookmarks: ! kdWarning() << "manage not implemented yet" << endl; break; } --- 44,48 ---- break; case ManageBookmarks: ! manager->slotEditBookmarks(); break; } *************** *** 44,52 **** if (dlg.exec() == KDialog::Accepted) { KrBookmark *bm = new KrBookmark(dlg.name(), dlg.url(), _collection); ! addBookmark(bm, true, dlg.folder()); } } ! void KrBookmarkHandler::addBookmark(KrBookmark *bm, bool saveData, KrBookmark *folder) { if (folder == 0) folder = _root; --- 53,61 ---- if (dlg.exec() == KDialog::Accepted) { KrBookmark *bm = new KrBookmark(dlg.name(), dlg.url(), _collection); ! addBookmark(bm, dlg.folder()); } } ! void KrBookmarkHandler::addBookmark(KrBookmark *bm, KrBookmark *folder) { if (folder == 0) folder = _root; *************** *** 55,60 **** folder->children().append(bm); ! if (saveData) // save ! exportToFile(); } --- 64,68 ---- folder->children().append(bm); ! exportToFile(); } *************** *** 175,178 **** --- 183,188 ---- void KrBookmarkHandler::importFromFile() { + clearBookmarks(_root); + QString filename = locateLocal( "data", BOOKMARKS_FILE ); QFile file( filename ); *************** *** 213,273 **** void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { static int inSecondaryMenu = 0; // used to know if we're on the top menu for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { if (bm->isFolder()) { KPopupMenu *newMenu = new KPopupMenu(menu); menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), ! bm->text(), newMenu); ++inSecondaryMenu; buildMenu(bm, newMenu); --inSecondaryMenu; } else { ! bm->plug(menu); CONNECT_BM(bm); } } - - if (inSecondaryMenu) // don't add special bookmarks/operations on submenus - return; - - // add the bottom half: operations - // border: a dummy item used to separate normal bookmarks from special ones, - // operations etc. we use it later when inserting bookmarks at the bottom - menu->insertItem("border-dummy", Border); - menu->setItemVisible(Border, false); - - // do we need to add special bookmarks? - if (SPECIAL_BOOKMARKS) { - // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc - menu->insertSeparator(); - KrBookmark *bm = KrBookmark::devices(_collection); - bm->plug(menu); - CONNECT_BM(bm); - } - menu->insertSeparator(); - menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), - i18n("Bookmark Current"), BookmarkCurrent); - menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), - i18n("Manage Bookmarks"), ManageBookmarks); - - // make sure the menu is connected to us - disconnect(menu, SIGNAL(activated(int)), 0, 0); - connect(menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); } void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { ! #if 0 ! KrBookmark *tmp, *bm = root->children().first(); ! while (bm) { if (bm->isFolder()) clearBookmarks(bm); ! tmp = bm; ! bm = root->children().next(); ! // TODO: clear all subfolders too ! tmp->unplugAll(); ! delete tmp; } ! #endif } --- 223,284 ---- void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { static int inSecondaryMenu = 0; // used to know if we're on the top menu + int floc=0, bloc=0; + + if (!inSecondaryMenu) { + menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), + i18n("Bookmark Current"), BookmarkCurrent); + menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), + i18n("Manage Bookmarks"), ManageBookmarks); + // make sure the menu is connected to us + disconnect(menu, SIGNAL(activated(int)), 0, 0); + connect(menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); + menu->insertSeparator(); + + floc = bloc = 3; // 2 items + 1 separator + + // do we need to add special bookmarks? + if (SPECIAL_BOOKMARKS) { + // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc + KrBookmark *bm = KrBookmark::devices(_collection); + bm->plug(menu); + CONNECT_BM(bm); + menu->insertSeparator(); + + floc = (bloc+=2); // 1 bookmark + separator + } + } + for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { if (bm->isFolder()) { KPopupMenu *newMenu = new KPopupMenu(menu); + // add folders above bookmarks menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), ! bm->text(), newMenu, -1 /* dummy id */, floc++); ! ++bloc; // stuffed a folder in the middle ++inSecondaryMenu; buildMenu(bm, newMenu); --inSecondaryMenu; } else { ! bm->plug(menu, bloc++); CONNECT_BM(bm); } } } void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { ! KrBookmark *bm = root->children().first(); ! while (bm) { if (bm->isFolder()) clearBookmarks(bm); ! else bm->unplugAll(); ! bm = root->children().next(); } ! root->children().clear(); ! } ! ! void KrBookmarkHandler::bookmarksChanged(const QString&, const QString&) { ! importFromFile(); } Index: kraddbookmarkdlg.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kraddbookmarkdlg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kraddbookmarkdlg.h 6 Oct 2004 01:02:24 -0000 1.2 --- kraddbookmarkdlg.h 6 Oct 2004 14:42:26 -0000 1.3 *************** *** 25,28 **** --- 25,29 ---- void toggleCreateIn(bool show); void createInSelection(QListViewItem *item); + void newFolder(); private: Index: krbookmarkhandler.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** krbookmarkhandler.h 6 Oct 2004 01:02:24 -0000 1.9 --- krbookmarkhandler.h 6 Oct 2004 14:42:26 -0000 1.10 *************** *** 10,25 **** class KActionCollection; class KrBookmarkHandler: public QObject { Q_OBJECT friend class KrAddBookmarkDlg; ! enum Actions { Border, BookmarkCurrent, ManageBookmarks }; public: KrBookmarkHandler(); void populate(KPopupMenu *menu); protected: void bookmarkCurrent(KURL url); - void addBookmark(KrBookmark *bm, bool saveData = true, KrBookmark *parent = 0); void deleteBookmark(KrBookmark *bm); void importFromFile(); --- 10,27 ---- class KActionCollection; + class KBookmarkManager; class KrBookmarkHandler: public QObject { Q_OBJECT friend class KrAddBookmarkDlg; ! enum Actions { BookmarkCurrent=0, ManageBookmarks }; public: KrBookmarkHandler(); + ~KrBookmarkHandler(); void populate(KPopupMenu *menu); + void addBookmark(KrBookmark *bm, KrBookmark *parent = 0); protected: void bookmarkCurrent(KURL url); void deleteBookmark(KrBookmark *bm); void importFromFile(); *************** *** 34,41 **** --- 36,46 ---- protected slots: void menuOperation(int id); + void bookmarksChanged(const QString&, const QString&); private: KActionCollection *_collection; KrBookmark *_root; + // the whole KBookmarkManager is an ugly hack. use it until we have our own + KBookmarkManager *manager; }; Index: kraddbookmarkdlg.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kraddbookmarkdlg.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kraddbookmarkdlg.cpp 6 Oct 2004 01:02:24 -0000 1.3 --- kraddbookmarkdlg.cpp 6 Oct 2004 14:42:26 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- #include <qlayout.h> #include <qlabel.h> + #include <kinputdialog.h> #include <kiconloader.h> #include <kdebug.h> *************** *** 15,18 **** --- 16,20 ---- setButtonText(KDialogBase::User1, i18n("New Folder")); showButton(KDialogBase::User1, false); // hide it until _createIn is shown + connect(this, SIGNAL(user1Clicked()), this, SLOT(newFolder())); // create the main widget *************** *** 94,95 **** --- 96,113 ---- } } + + void KrAddBookmarkDlg::newFolder() { + // get the name + QString newFolder = KInputDialog::getText(i18n("New Folder"), i18n("Folder name:"), QString::null, 0, this); + if (newFolder == QString::null) + return; + // add to the list in bookman + KrBookmark *bm = new KrBookmark(newFolder); + krBookMan->addBookmark(bm, _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]); + // fix the gui + KListViewItem *item = new KListViewItem(_createIn->selectedItem(), bm->text()); + _xr[item] = bm; + + _createIn->setCurrentItem(item); + item->setSelected(true); + } Index: krbookmark.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmark.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** krbookmark.cpp 5 Oct 2004 15:07:32 -0000 1.5 --- krbookmark.cpp 6 Oct 2004 14:42:26 -0000 1.6 *************** *** 19,22 **** --- 19,24 ---- else setIcon("folder_html"); } + + _children.setAutoDelete(true); } |
|
From: Shie E. <er...@us...> - 2004-10-06 14:43:39
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Panel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7814/krusader/Panel Modified Files: listpanel.cpp Log Message: bookman2 is alive! Index: listpanel.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** listpanel.cpp 4 Oct 2004 22:50:26 -0000 1.93 --- listpanel.cpp 6 Oct 2004 14:42:27 -0000 1.94 *************** *** 93,100 **** ! //#define BOOKMAN2 #ifdef BOOKMAN2 #include "../BookMan/krbookmarkbutton.h" - #endif // BOOKMAN2 --- 93,99 ---- ! #define BOOKMAN2 #ifdef BOOKMAN2 #include "../BookMan/krbookmarkbutton.h" #endif // BOOKMAN2 *************** *** 132,136 **** connect( historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( historyButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); ! // ... create the bookmark list bookmarksButton = new BookmarksButton( this ); --- 131,135 ---- connect( historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( historyButton, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); ! #ifndef BOOKMAN2 // ... create the bookmark list bookmarksButton = new BookmarksButton( this ); *************** *** 141,148 **** --- 140,152 ---- "current location to the list, edit bookmarks " "or add subfolder to the list." ) ); + #endif #ifdef BOOKMAN2 bmb = new KrBookmarkButton(this); connect( bmb, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) ); connect( bmb, SIGNAL( openUrl( const KURL& ) ), func, SLOT( delayedOpenUrl( const KURL& ) ) ); + QWhatsThis::add + ( bmb, i18n( "Open menu with bookmarks. You can also add " + "current location to the list, edit bookmarks " + "or add subfolder to the list." ) ); #endif // BOOKMAN2 *************** *** 250,262 **** // finish the layout #ifdef BOOKMAN2 ! layout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); layout->addWidget( status, 1, 0 ); layout->addWidget( historyButton, 1, 1 ); ! layout->addWidget( bookmarksButton, 1, 2 ); ! layout->addWidget( bmb, 1, 3 ); ! layout->addMultiCellWidget( splt, 2, 2, 0, 3 ); ! layout->addMultiCellWidget( quickSearch, 3, 3, 0, 3 ); quickSearch->hide(); ! layout->addMultiCellLayout( totalsLayout, 4, 4, 0, 3 ); #else layout->addMultiCellWidget( hbox, 0, 0, 0, 2 ); --- 254,265 ---- // finish the layout #ifdef BOOKMAN2 ! layout->addMultiCellWidget( hbox, 0, 0, 0, 2 ); layout->addWidget( status, 1, 0 ); layout->addWidget( historyButton, 1, 1 ); ! layout->addWidget( bmb, 1, 2 ); ! layout->addMultiCellWidget( splt, 2, 2, 0, 2 ); ! layout->addMultiCellWidget( quickSearch, 3, 3, 0, 2 ); quickSearch->hide(); ! layout->addMultiCellLayout( totalsLayout, 4, 4, 0, 2 ); #else layout->addMultiCellWidget( hbox, 0, 0, 0, 2 ); *************** *** 276,280 **** --- 279,285 ---- delete view; delete status; + #ifndef BOOKMAN2 delete bookmarksButton; + #endif delete totals; delete quickSearch; |
|
From: Jonas B. <jb...@us...> - 2004-10-06 13:49:43
|
Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26681/krusader/UserAction Modified Files: expander.cpp expander.h Log Message: Removed compiler-warnings Index: expander.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** expander.h 26 Sep 2004 21:57:57 -0000 1.4 --- expander.h 6 Oct 2004 13:48:23 -0000 1.5 *************** *** 50,53 **** --- 50,55 ---- class exp_placeholder { public: + virtual inline ~exp_placeholder() + { for ( int i = 0; i < parameterCount(); ++i ) delete parameter( i ); } inline QString expression() ///< The placeholder (without '%' or panel-prefix) { return _expression; } *************** *** 60,64 **** inline int parameterCount() ///< returns the number of placeholders { return _parameter.count(); } ! inline exp_parameter* parameter( int id ) { return _parameter[ id ]; } --- 62,66 ---- inline int parameterCount() ///< returns the number of placeholders { return _parameter.count(); } ! inline exp_parameter* parameter( int id ) ///< returns a specific parameter { return _parameter[ id ]; } *************** *** 75,79 **** inline exp_separator( bool needPanel ) { _needPanel = needPanel; } ! inline EXP_FUNC {} }; --- 77,81 ---- inline exp_separator( bool needPanel ) { _needPanel = needPanel; } ! inline EXP_FUNC { return QString::null; } }; *************** *** 230,233 **** --- 232,236 ---- public: Expander(); + ~Expander(); inline void addPlaceholder( exp_placeholder* placeholder ) ///< adds placeholder to the expander. Index: expander.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** expander.cpp 26 Sep 2004 21:57:57 -0000 1.7 --- expander.cpp 6 Oct 2004 13:48:23 -0000 1.8 *************** *** 205,209 **** } } ! kdDebug() << "result: '" << result << "'" << endl; return result; } --- 205,209 ---- } } ! return result; } *************** *** 367,371 **** Expander::Expander() { - kdDebug() << "new Expander" << endl; //Penel-dependent: addPlaceholder( new exp_Path() ); --- 367,370 ---- *************** *** 387,390 **** --- 386,394 ---- } + Expander::~Expander() { + for ( int i = 0; i < placeholderCount(); ++i ) + delete placeholder( i ); + } + ListPanel* Expander::getPanel( const char& panelIndicator ) { switch ( panelIndicator ) { |
|
From: Shie E. <er...@us...> - 2004-10-06 01:02:37
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4122 Modified Files: kraddbookmarkdlg.cpp kraddbookmarkdlg.h krbookmarkhandler.cpp krbookmarkhandler.h Log Message: add bookmark dialog: almost completely working Index: krbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** krbookmarkhandler.cpp 5 Oct 2004 15:07:32 -0000 1.8 --- krbookmarkhandler.cpp 6 Oct 2004 01:02:24 -0000 1.9 *************** *** 16,21 **** // ------------------------ for internal use #define BOOKMARKS_FILE "krusader/bookman2.xml" - #define TOP_OF_MENU 0 - #define BOTTOM_OF_MENU _menu->indexOf(Border) #define CONNECT_BM(X) connect(X, SIGNAL(activated(const KURL&)), SLOTS, SLOT(refresh(const KURL&))); --- 16,19 ---- *************** *** 25,29 **** // create _root: father of all bookmarks. it is a dummy bookmark and never shown ! _root = new KrBookmark("root"); // load bookmarks --- 23,27 ---- // create _root: father of all bookmarks. it is a dummy bookmark and never shown ! _root = new KrBookmark(i18n("Bookmarks")); // load bookmarks *************** *** 31,77 **** } - KrBookmarkHandler::KrBookmarkHandler(QWidget *parent, KPopupMenu *menu): QObject(parent) { - // create our own action collection and make the shortcuts apply only to parent - _collection = new KActionCollection(0, parent); - - // create _root: father of all bookmarks. it is a dummy bookmark and never shown - _root = new KrBookmark("root"); - - // start watching the bookmarks file for updates - //_filename = locateLocal( "data", BOOKMARKS_FILE ); - //_dirwatch = new KDirWatch(this); - //_dirwatch->addFile(locateLocal("data", BOOKMARKS_FILE)); - //connect(_dirwatch, SIGNAL(dirty(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); - //connect(_dirwatch, SIGNAL(created(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); - - // add quick navigation - //_menu->setKeyboardShortcutsEnabled(true); - //_menu->setKeyboardShortcutsExecute(true); - //connect(_menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); - - // load bookmarks and populate the menu - importFromFile(); - - - // border: a dummy item used to separate normal bookmarks from special ones, - // operations etc. we use it later when inserting bookmarks at the bottom - //_menu->insertItem("border-dummy", Border); - //_menu->setItemVisible(Border, false); - - // do we need to add special bookmarks? - if (SPECIAL_BOOKMARKS) { - // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc - //_menu->insertSeparator(); - KrBookmark *bm = KrBookmark::devices(_collection); - //bm->plug(_menu); - CONNECT_BM(bm); - } - //_menu->insertSeparator(); - //_menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), - // i18n("Bookmark Current"), BookmarkCurrent); - //_menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), - // i18n("Manage Bookmarks"), ManageBookmarks); - } - void KrBookmarkHandler::menuOperation(int id) { switch (id) { --- 29,32 ---- *************** *** 89,93 **** if (dlg.exec() == KDialog::Accepted) { KrBookmark *bm = new KrBookmark(dlg.name(), dlg.url(), _collection); ! addBookmark(bm); } } --- 44,48 ---- if (dlg.exec() == KDialog::Accepted) { KrBookmark *bm = new KrBookmark(dlg.name(), dlg.url(), _collection); ! addBookmark(bm, true, dlg.folder()); } } *************** *** 100,107 **** folder->children().append(bm); - // add to menu - //bm->plug(_menu, BOTTOM_OF_MENU); - //CONNECT_BM(bm); - if (saveData) // save exportToFile(); --- 55,58 ---- *************** *** 261,264 **** --- 212,217 ---- void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { + static int inSecondaryMenu = 0; // used to know if we're on the top menu + for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) { if (bm->isFolder()) { *************** *** 266,284 **** menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), bm->text(), newMenu); buildMenu(bm, newMenu); } else { ! kdWarning() << "Adding " << bm->text() << endl; ! bm->plug(menu); // add on top CONNECT_BM(bm); } } - } ! void KrBookmarkHandler::bookmarksUpdated(const QString &) { ! clearBookmarks(_root); ! importFromFile(); } void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { KrBookmark *tmp, *bm = root->children().first(); while (bm) { --- 219,262 ---- menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), bm->text(), newMenu); + ++inSecondaryMenu; buildMenu(bm, newMenu); + --inSecondaryMenu; } else { ! bm->plug(menu); CONNECT_BM(bm); } } ! if (inSecondaryMenu) // don't add special bookmarks/operations on submenus ! return; ! ! // add the bottom half: operations ! // border: a dummy item used to separate normal bookmarks from special ones, ! // operations etc. we use it later when inserting bookmarks at the bottom ! menu->insertItem("border-dummy", Border); ! menu->setItemVisible(Border, false); ! ! // do we need to add special bookmarks? ! if (SPECIAL_BOOKMARKS) { ! // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc ! menu->insertSeparator(); ! KrBookmark *bm = KrBookmark::devices(_collection); ! bm->plug(menu); ! CONNECT_BM(bm); ! } ! menu->insertSeparator(); ! menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), ! i18n("Bookmark Current"), BookmarkCurrent); ! menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), ! i18n("Manage Bookmarks"), ManageBookmarks); ! ! // make sure the menu is connected to us ! disconnect(menu, SIGNAL(activated(int)), 0, 0); ! connect(menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); } + void KrBookmarkHandler::clearBookmarks(KrBookmark *root) { + #if 0 KrBookmark *tmp, *bm = root->children().first(); while (bm) { *************** *** 292,294 **** --- 270,273 ---- delete tmp; } + #endif } Index: kraddbookmarkdlg.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kraddbookmarkdlg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kraddbookmarkdlg.h 29 Sep 2004 00:33:25 -0000 1.1 --- kraddbookmarkdlg.h 6 Oct 2004 01:02:24 -0000 1.2 *************** *** 2,18 **** --- 2,36 ---- #define KRADDBOOKMARKDLG_H + #include "krbookmark.h" #include <kdialogbase.h> #include <kurl.h> #include <klineedit.h> + #include <qmap.h> + #include <klistview.h> + #include <qtoolbutton.h> class KrAddBookmarkDlg: public KDialogBase { + Q_OBJECT public: KrAddBookmarkDlg(QWidget *parent, KURL url = 0); QString url() const { return _url->text(); } QString name() const { return _name->text(); } + KrBookmark *folder() const { return _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]; } + + protected: + QWidget *createInWidget(); + void populateCreateInWidget(KrBookmark *root, KListViewItem *parent); + + protected slots: + void toggleCreateIn(bool show); + void createInSelection(QListViewItem *item); private: KLineEdit *_name; KLineEdit *_url; + KLineEdit *_folder; + KListView *_createIn; + QMap<KListViewItem*, KrBookmark*> _xr; + QToolButton *_createInBtn; }; Index: krbookmarkhandler.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** krbookmarkhandler.h 5 Oct 2004 15:07:32 -0000 1.8 --- krbookmarkhandler.h 6 Oct 2004 01:02:24 -0000 1.9 *************** *** 13,21 **** class KrBookmarkHandler: public QObject { Q_OBJECT ! enum Actions { Border, BookmarkCurrent, ManageBookmarks }; public: KrBookmarkHandler(); - KrBookmarkHandler(QWidget *parent, KPopupMenu *menu); void populate(KPopupMenu *menu); --- 13,20 ---- class KrBookmarkHandler: public QObject { Q_OBJECT ! friend class KrAddBookmarkDlg; enum Actions { Border, BookmarkCurrent, ManageBookmarks }; public: KrBookmarkHandler(); void populate(KPopupMenu *menu); *************** *** 35,40 **** protected slots: void menuOperation(int id); ! void bookmarksUpdated(const QString &); ! private: KActionCollection *_collection; --- 34,38 ---- protected slots: void menuOperation(int id); ! private: KActionCollection *_collection; Index: kraddbookmarkdlg.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kraddbookmarkdlg.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kraddbookmarkdlg.cpp 1 Oct 2004 00:20:58 -0000 1.2 --- kraddbookmarkdlg.cpp 6 Oct 2004 01:02:24 -0000 1.3 *************** *** 1,11 **** #include "kraddbookmarkdlg.h" #include <klocale.h> #include <qlayout.h> #include <qlabel.h> KrAddBookmarkDlg::KrAddBookmarkDlg(QWidget *parent, KURL url): KDialogBase(KDialogBase::Swallow, i18n("Add Bookmark"), ! KDialogBase::Details | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent) { ! setButtonText(KDialogBase::Details, i18n("Create in"));; // create the main widget --- 1,18 ---- #include "kraddbookmarkdlg.h" + #include "../krusader.h" + #include "krbookmarkhandler.h" #include <klocale.h> + #include <qheader.h> #include <qlayout.h> #include <qlabel.h> + #include <kiconloader.h> + #include <kdebug.h> KrAddBookmarkDlg::KrAddBookmarkDlg(QWidget *parent, KURL url): KDialogBase(KDialogBase::Swallow, i18n("Add Bookmark"), ! KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent) { ! // create the 'new folder' button ! setButtonText(KDialogBase::User1, i18n("New Folder")); ! showButton(KDialogBase::User1, false); // hide it until _createIn is shown // create the main widget *************** *** 26,29 **** --- 33,95 ---- _url->setText(url.url()); // set the url in the field + // create in linedit and button + QLabel *lb3 = new QLabel(i18n("Create in:"), page); + _folder = new KLineEdit(page); + layout->addWidget(lb3, 2, 0); + layout->addWidget(_folder, 2, 1); + _folder->setReadOnly(true); + + _createInBtn = new QToolButton(page); + _createInBtn->setPixmap(krLoader->loadIcon("down", KIcon::Small)); + _createInBtn->setToggleButton(true); + connect(_createInBtn, SIGNAL(toggled(bool)), this, SLOT(toggleCreateIn(bool ))); + layout->addWidget(_createInBtn, 2, 2); + + setDetailsWidget(createInWidget()); + _name->setFocus(); } + + void KrAddBookmarkDlg::toggleCreateIn(bool show) { + _createInBtn->setPixmap(krLoader->loadIcon(show ? "up" :"down", KIcon::Small)); + showButton(KDialogBase::User1, show); + setDetails(show); + } + + // creates the widget that lets you decide where to put the new bookmark + QWidget *KrAddBookmarkDlg::createInWidget() { + _createIn = new KListView(this); + _createIn->addColumn("Folders"); + _createIn->header()->hide(); + _createIn->setRootIsDecorated(true); + _createIn->setAlternateBackground(QColor()); // disable alternate coloring + + KListViewItem *item = new KListViewItem(_createIn, i18n("Bookmarks")); + item->setOpen(true); + item->setSelected(true); + _xr[item] = krBookMan->_root; + + populateCreateInWidget(krBookMan->_root, item); + _createIn->setCurrentItem(item); + createInSelection(item); + connect(_createIn, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(createInSelection(QListViewItem*))); + + return _createIn; + } + + void KrAddBookmarkDlg::createInSelection(QListViewItem *item) { + if (item) { + _folder->setText(_xr[static_cast<KListViewItem*>(item)]->text()); + } + } + + void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) { + for (KrBookmark *bm = root->children().first(); bm; bm = root->children().next()) { + if (bm->isFolder()) { + KListViewItem *item = new KListViewItem(parent, bm->text()); + item->setOpen(true); + _xr[item] = bm; + populateCreateInWidget(bm, item); + } + } + } |
|
From: Shie E. <er...@us...> - 2004-10-05 23:07:58
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8102/krusader Modified Files: krslots.cpp Log Message: set refresh() to use delayedOpenUrl() always. this is done because the bookmarks connect to this one, and since refreshing from here is always user-generated, so no difference should be felt Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** krslots.cpp 5 Oct 2004 18:51:10 -0000 1.65 --- krslots.cpp 5 Oct 2004 23:07:46 -0000 1.66 *************** *** 266,270 **** void KRslots::root() { ACTIVE_FUNC->openUrl(vfs::fromPathOrURL("/"));} ! void KRslots::refresh(const KURL& u){ ACTIVE_FUNC->openUrl(u); } void KRslots::home() { ACTIVE_FUNC->openUrl(QDir::homeDirPath()); } void KRslots::refresh() { ACTIVE_FUNC->refresh(); } --- 266,270 ---- void KRslots::root() { ACTIVE_FUNC->openUrl(vfs::fromPathOrURL("/"));} ! void KRslots::refresh(const KURL& u){ ACTIVE_FUNC->delayedOpenUrl(u); } void KRslots::home() { ACTIVE_FUNC->openUrl(QDir::homeDirPath()); } void KRslots::refresh() { ACTIVE_FUNC->refresh(); } |
|
From: Karai C. <ck...@us...> - 2004-10-05 21:24:54
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16633/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: FIXED: krusader doesn't "dance" at recreating the panels Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** panelmanager.cpp 5 Oct 2004 20:51:30 -0000 1.20 --- panelmanager.cpp 5 Oct 2004 21:24:43 -0000 1.21 *************** *** 231,254 **** void PanelManager::recreatePanels() { ! int panelCount = _tabbar->count(), identifier = 0; ! ListPanel *oldCurrent = _self, *newCurrent = 0; ! ! while ( panelCount -- ) { ! ListPanel * panel = dynamic_cast<PanelTab*>( _tabbar->tabAt( 0 ) ) ->panel; ! slotNewTab( panel->virtualPath ); ! ! if ( panel == oldCurrent ) ! newCurrent = _self, identifier = _tabbar->currentTab(); ! ! _tabbar->setCurrentTab( _tabbar->tabAt( 0 ) ); ! slotChangePanel( panel ); ! slotCloseTab(); ! } ! if ( newCurrent ) { ! _tabbar->setCurrentTab( identifier ); ! slotChangePanel( newCurrent ); } } --- 231,260 ---- void PanelManager::recreatePanels() { ! int actTab = activeTab(); ! ! for( int i = 0; i != _tabbar->count(); i++ ) ! { ! PanelTab *updatedPanel = dynamic_cast<PanelTab*>(_tabbar->tabAt( i ) ); ! ! ListPanel *oldPanel = updatedPanel->panel; ! ListPanel *newPanel = new ListPanel( _stack, _left ); ! _stack->addWidget( newPanel, i ); ! _stack->removeWidget( oldPanel ); ! disconnect( oldPanel ); ! connect( newPanel, SIGNAL( activePanelChanged( ListPanel* ) ), this, SLOT( slotRefreshActions() ) ); ! connect( newPanel, SIGNAL( pathChanged(ListPanel*) ), _tabbar, SLOT(updateTab(ListPanel*))); ! newPanel->otherPanel = _other; ! if( _other->otherPanel == oldPanel ) ! _other->otherPanel = newPanel; ! updatedPanel->panel = newPanel; ! newPanel->start( oldPanel->virtualPath ); ! delete oldPanel; ! ! _tabbar->updateTab( newPanel ); } + + setActiveTab( actTab ); } |
|
From: Karai C. <ck...@us...> - 2004-10-05 20:51:58
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9307/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: FIXED: openUrl() is better than calling start() for existing panels Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** panelmanager.cpp 5 Oct 2004 18:51:10 -0000 1.19 --- panelmanager.cpp 5 Oct 2004 20:51:30 -0000 1.20 *************** *** 8,11 **** --- 8,12 ---- #include "panelmanager.h" #include "Panel/listpanel.h" + #include "Panel/panelfunc.h" #include "krusaderview.h" *************** *** 115,119 **** t->panel->otherPanel = _other; _other->otherPanel = t->panel; ! t->panel->start( l[ i ] ); } ++i; --- 116,120 ---- t->panel->otherPanel = _other; _other->otherPanel = t->panel; ! t->panel->func->openUrl( vfs::fromPathOrURL( l[ i ] ) ); } ++i; |
|
From: Karai C. <ck...@us...> - 2004-10-05 18:51:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12869/krusader_kde3/krusader Modified Files: krslots.cpp panelmanager.cpp panelmanager.h paneltabbar.cpp paneltabbar.h Log Message: FIXED: fully functional Panel Profiles Index: paneltabbar.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** paneltabbar.cpp 31 Aug 2004 23:46:38 -0000 1.11 --- paneltabbar.cpp 5 Oct 2004 18:51:10 -0000 1.12 *************** *** 74,78 **** } ! int PanelTabBar::addPanel(ListPanel *panel) { int newId = addTab(new PanelTab(squeeze(panel->virtualPath), panel)); --- 74,78 ---- } ! int PanelTabBar::addPanel(ListPanel *panel, bool setCurrent ) { int newId = addTab(new PanelTab(squeeze(panel->virtualPath), panel)); *************** *** 81,85 **** tabAt(i)->setText(squeeze(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath, i)); layoutTabs(); ! setCurrentTab(newId); // enable close-tab action --- 81,87 ---- tabAt(i)->setText(squeeze(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath, i)); layoutTabs(); ! ! if( setCurrent ) ! setCurrentTab(newId); // enable close-tab action Index: paneltabbar.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** paneltabbar.h 31 Aug 2004 23:46:38 -0000 1.8 --- paneltabbar.h 5 Oct 2004 18:51:10 -0000 1.9 *************** *** 51,55 **** * called by PanelManager with an already created panel, and creates the corrosponding tab */ ! int addPanel(ListPanel *panel); /** * when the user changes the current path in a panel, this method updates the tab accordingly --- 51,55 ---- * called by PanelManager with an already created panel, and creates the corrosponding tab */ ! int addPanel(ListPanel *panel, bool setCurrent = true ); /** * when the user changes the current path in a panel, this method updates the tab accordingly Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** panelmanager.cpp 5 Oct 2004 03:35:48 -0000 1.18 --- panelmanager.cpp 5 Oct 2004 18:51:10 -0000 1.19 *************** *** 62,66 **** } ! ListPanel* PanelManager::createPanel() { // create the panel and add it into the widgetstack ListPanel * p = new ListPanel( _stack, _left ); --- 62,66 ---- } ! ListPanel* PanelManager::createPanel( bool setCurrent ) { // create the panel and add it into the widgetstack ListPanel * p = new ListPanel( _stack, _left ); *************** *** 68,72 **** // now, create the corrosponding tab ! _tabbar->addPanel( p ); // allow close button if more than 1 tab --- 68,72 ---- // now, create the corrosponding tab ! _tabbar->addPanel( p, setCurrent ); // allow close button if more than 1 tab *************** *** 75,79 **** SHOW // needed if we were hidden } ! _stack->raiseWidget( p ); // connect the activePanelChanged signal to enable/disable actions --- 75,80 ---- SHOW // needed if we were hidden } ! if( setCurrent ) ! _stack->raiseWidget( p ); // connect the activePanelChanged signal to enable/disable actions *************** *** 112,117 **** if (t && t->panel) { ! _tabbar->setCurrentTab( t ); ! slotChangePanel( t->panel ); t->panel->start( l[ i ] ); } --- 113,118 ---- if (t && t->panel) { ! t->panel->otherPanel = _other; ! _other->otherPanel = t->panel; t->panel->start( l[ i ] ); } *************** *** 120,137 **** while( i < totalTabs ) ! { ! PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt( --totalTabs )); ! if (t && t->panel) ! { ! _tabbar->setCurrentTab( _tabbar->tabAt( totalTabs ) ); ! slotChangePanel( t->panel ); ! slotCloseTab(); ! } ! } ! for(; i < (int)l.count(); i++ ) ! { ! slotNewTab( l[i] ); ! } } --- 121,128 ---- while( i < totalTabs ) ! slotCloseTab( --totalTabs ); ! for(; i < (int)l.count(); i++ ) ! slotNewTab( l[i], false ); } *************** *** 140,150 **** } ! void PanelManager::slotNewTab( QString path ) { ! _self = createPanel(); // update left/right pointers ! _self->otherPanel = _other; ! _other->otherPanel = _self; ! ! startPanel( _self, path ); } --- 131,144 ---- } ! void PanelManager::slotNewTab( QString path, bool setCurrent ) { ! ListPanel *p = createPanel( setCurrent ); // update left/right pointers ! p->otherPanel = _other; ! if( setCurrent ) ! { ! _self = p; ! _other->otherPanel = _self; ! } ! startPanel( p, path ); } *************** *** 172,175 **** --- 166,199 ---- } + void PanelManager::slotCloseTab( int index ) { + PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt( index )); + if (t && t->panel) + { + ListPanel *oldp = t->panel; + disconnect( oldp ); + if( t->identifier() == _tabbar->currentTab() ) + { + PanelTab *newCurrent = dynamic_cast<PanelTab*>( _tabbar->tabAt( 0 ) ); + if( newCurrent != 0 ) + { + _tabbar->setCurrentTab( newCurrent ); + _self = newCurrent->panel; + _self->otherPanel = _other; + _other->otherPanel = _self; + } + } + _tabbar->removeTab( t ); + + _stack->removeWidget( oldp ); + delete oldp; + } + + if ( _tabbar->count() == 1 ) + { + _closeTab->setEnabled( false ); + if ( HIDE_ON_SINGLE_TAB ) HIDE + } + } + void PanelManager::slotRefreshActions() { krCloseTab->setEnabled( _tabbar->count() > 1 ); *************** *** 192,195 **** --- 216,232 ---- } + void PanelManager::setCurrentTab( int panelIndex ) + { + PanelTab *current = dynamic_cast<PanelTab*>(_tabbar->tabAt( panelIndex ) ); + if( current == 0 ) + return; + _tabbar->setCurrentTab( current ); + _self = current->panel; + _self->otherPanel = _other; + _other->otherPanel = _self; + + _stack->raiseWidget( _self ); + } + void PanelManager::recreatePanels() { int panelCount = _tabbar->count(), identifier = 0; Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** krslots.cpp 5 Oct 2004 00:39:47 -0000 1.64 --- krslots.cpp 5 Oct 2004 18:51:10 -0000 1.65 *************** *** 785,793 **** MAIN_VIEW->leftMng->loadSettings( krConfig, "Left Tabs" ); krConfig->setGroup( group ); ! MAIN_VIEW->leftMng->setActiveTab( krConfig->readNumEntry( "Left Active Tab", 0 ) ); krConfig->setGroup( group ); MAIN_VIEW->rightMng->loadSettings( krConfig, "Right Tabs" ); krConfig->setGroup( group ); ! MAIN_VIEW->rightMng->setActiveTab( krConfig->readNumEntry( "Right Active Tab", 0 ) ); krConfig->setGroup( group ); if( krConfig->readBoolEntry( "Left Side Is Active", true ) ) --- 785,793 ---- MAIN_VIEW->leftMng->loadSettings( krConfig, "Left Tabs" ); krConfig->setGroup( group ); ! MAIN_VIEW->leftMng->setCurrentTab( krConfig->readNumEntry( "Left Active Tab", 0 ) ); krConfig->setGroup( group ); MAIN_VIEW->rightMng->loadSettings( krConfig, "Right Tabs" ); krConfig->setGroup( group ); ! MAIN_VIEW->rightMng->setCurrentTab( krConfig->readNumEntry( "Right Active Tab", 0 ) ); krConfig->setGroup( group ); if( krConfig->readBoolEntry( "Left Side Is Active", true ) ) Index: panelmanager.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** panelmanager.h 5 Oct 2004 00:39:47 -0000 1.11 --- panelmanager.h 5 Oct 2004 18:51:10 -0000 1.12 *************** *** 28,32 **** * Note: only creates the panel, but doesn't start the VFS inside it. Use startPanel() for that. */ ! ListPanel* createPanel(); /** * Called once by KrusaderView to start the first panel. Subsequent called are done internally --- 28,32 ---- * Note: only creates the panel, but doesn't start the VFS inside it. Use startPanel() for that. */ ! ListPanel* createPanel( bool setCurrent = true ); /** * Called once by KrusaderView to start the first panel. Subsequent called are done internally *************** *** 47,50 **** --- 47,51 ---- int activeTab(); void setActiveTab( int ); + void setCurrentTab( int ); public slots: *************** *** 53,61 **** * action, from the context-menu. */ ! void slotNewTab(QString path); void slotNewTab(); ! void slotNextTab(); void slotPreviousTab(); void slotCloseTab(); protected slots: --- 54,63 ---- * action, from the context-menu. */ ! void slotNewTab(QString path, bool setCurrent = true ); void slotNewTab(); ! void slotNextTab(); void slotPreviousTab(); void slotCloseTab(); + void slotCloseTab( int index ); protected slots: |
|
From: Karai C. <ck...@us...> - 2004-10-05 18:51:23
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12869/krusader_kde3 Modified Files: CVSNEWS Log Message: FIXED: fully functional Panel Profiles Index: CVSNEWS =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CVSNEWS 27 Sep 2004 19:58:17 -0000 1.19 --- CVSNEWS 5 Oct 2004 18:51:10 -0000 1.20 *************** *** 4,7 **** --- 4,17 ---- ------------------------------------------------------ + Panel profiles: from know it is possible to store environment profiles. + An environment profile contains the followings: + - all the tabs path (left / right) + - the current tab ( left / right ) + - and the selected side ( left or right ) + You can save / restore these tabulator profiles. Please test it. + Those users who uses CVS version of krusader, should delete the krusaderui.rc + from their home directory, for getting the new menu and toolbar item visible. + (rm ~/.kde/share/apps/krusader/krusaderui.rc) + Synchronizer: from now you can use the search filters in the synchronizer |
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21450 Modified Files: krbookmark.cpp krbookmark.h krbookmarkbutton.cpp krbookmarkbutton.h krbookmarkhandler.cpp krbookmarkhandler.h Log Message: starting to put it back in order. new bookmarks are usable now, but just barely. do not try it at home. really Index: krbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krbookmarkhandler.cpp 5 Oct 2004 09:30:41 -0000 1.7 --- krbookmarkhandler.cpp 5 Oct 2004 15:07:32 -0000 1.8 *************** *** 11,15 **** #include <kstandarddirs.h> #include <qfile.h> - #include <kdirwatch.h> #define SPECIAL_BOOKMARKS true --- 11,14 ---- *************** *** 19,25 **** #define TOP_OF_MENU 0 #define BOTTOM_OF_MENU _menu->indexOf(Border) ! #define CONNECT_BM(X) connect(X, SIGNAL(activated(KrBookmark *)), this, SLOT(bookmarkActivated(KrBookmark *))); ! #define STOPWATCH _dirwatch->stopDirScan(_filename) ! #define STARTWATCH _dirwatch->restartDirScan(_filename) KrBookmarkHandler::KrBookmarkHandler(): QObject(0) { --- 18,22 ---- #define TOP_OF_MENU 0 #define BOTTOM_OF_MENU _menu->indexOf(Border) ! #define CONNECT_BM(X) connect(X, SIGNAL(activated(const KURL&)), SLOTS, SLOT(refresh(const KURL&))); KrBookmarkHandler::KrBookmarkHandler(): QObject(0) { *************** *** 30,39 **** _root = new KrBookmark("root"); ! // load bookmarks and populate the menu ! _filename = locateLocal( "data", BOOKMARKS_FILE ); importFromFile(); } ! KrBookmarkHandler::KrBookmarkHandler(QWidget *parent, KPopupMenu *menu): QObject(parent), _menu(menu) { // create our own action collection and make the shortcuts apply only to parent _collection = new KActionCollection(0, parent); --- 27,35 ---- _root = new KrBookmark("root"); ! // load bookmarks importFromFile(); } ! KrBookmarkHandler::KrBookmarkHandler(QWidget *parent, KPopupMenu *menu): QObject(parent) { // create our own action collection and make the shortcuts apply only to parent _collection = new KActionCollection(0, parent); *************** *** 43,56 **** // start watching the bookmarks file for updates ! _filename = locateLocal( "data", BOOKMARKS_FILE ); ! _dirwatch = new KDirWatch(this); //_dirwatch->addFile(locateLocal("data", BOOKMARKS_FILE)); ! connect(_dirwatch, SIGNAL(dirty(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); ! connect(_dirwatch, SIGNAL(created(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); // add quick navigation ! _menu->setKeyboardShortcutsEnabled(true); ! _menu->setKeyboardShortcutsExecute(true); ! connect(_menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); // load bookmarks and populate the menu --- 39,52 ---- // start watching the bookmarks file for updates ! //_filename = locateLocal( "data", BOOKMARKS_FILE ); ! //_dirwatch = new KDirWatch(this); //_dirwatch->addFile(locateLocal("data", BOOKMARKS_FILE)); ! //connect(_dirwatch, SIGNAL(dirty(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); ! //connect(_dirwatch, SIGNAL(created(const QString &)), this, SLOT(bookmarksUpdated(const QString &))); // add quick navigation ! //_menu->setKeyboardShortcutsEnabled(true); ! //_menu->setKeyboardShortcutsExecute(true); ! //connect(_menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int))); // load bookmarks and populate the menu *************** *** 60,83 **** // border: a dummy item used to separate normal bookmarks from special ones, // operations etc. we use it later when inserting bookmarks at the bottom ! _menu->insertItem("border-dummy", Border); ! _menu->setItemVisible(Border, false); // do we need to add special bookmarks? if (SPECIAL_BOOKMARKS) { // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc ! _menu->insertSeparator(); KrBookmark *bm = KrBookmark::devices(_collection); ! bm->plug(_menu); CONNECT_BM(bm); } ! _menu->insertSeparator(); ! _menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), ! i18n("Bookmark Current"), BookmarkCurrent); ! _menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), ! i18n("Manage Bookmarks"), ManageBookmarks); ! } ! ! void KrBookmarkHandler::bookmarkActivated(KrBookmark *bm) { ! emit openUrl(bm->url()); } --- 56,75 ---- // border: a dummy item used to separate normal bookmarks from special ones, // operations etc. we use it later when inserting bookmarks at the bottom ! //_menu->insertItem("border-dummy", Border); ! //_menu->setItemVisible(Border, false); // do we need to add special bookmarks? if (SPECIAL_BOOKMARKS) { // note: special bookmarks are not kept inside the _bookmarks list and added ad-hoc ! //_menu->insertSeparator(); KrBookmark *bm = KrBookmark::devices(_collection); ! //bm->plug(_menu); CONNECT_BM(bm); } ! //_menu->insertSeparator(); ! //_menu->insertItem(krLoader->loadIcon("bookmark_add", KIcon::Small), ! // i18n("Bookmark Current"), BookmarkCurrent); ! //_menu->insertItem(krLoader->loadIcon("bookmark", KIcon::Small), ! // i18n("Manage Bookmarks"), ManageBookmarks); } *************** *** 109,114 **** // add to menu ! bm->plug(_menu, BOTTOM_OF_MENU); ! CONNECT_BM(bm); if (saveData) // save --- 101,106 ---- // add to menu ! //bm->plug(_menu, BOTTOM_OF_MENU); ! //CONNECT_BM(bm); if (saveData) // save *************** *** 161,167 **** // </xbel> void KrBookmarkHandler::exportToFile() { - // disable the dirwatch while saving the file - STOPWATCH; - QDomDocument doc( "xbel" ); QDomElement root = doc.createElement( "xbel" ); --- 153,156 ---- *************** *** 169,174 **** exportToFileFolder(doc, root, _root); ! ! QFile file(_filename); if ( file.open( IO_WriteOnly ) ) { QTextStream stream( &file ); --- 158,163 ---- exportToFileFolder(doc, root, _root); ! QString filename = locateLocal( "data", BOOKMARKS_FILE ); ! QFile file(filename); if ( file.open( IO_WriteOnly ) ) { QTextStream stream( &file ); *************** *** 176,184 **** file.close(); } else { ! KMessageBox::error(krApp, i18n("Error"), i18n("Unable to write to ") + _filename); } - - // re-enable the dirwatch - STARTWATCH; } --- 165,170 ---- file.close(); } else { ! KMessageBox::error(krApp, i18n("Error"), i18n("Unable to write to ") + filename); } } *************** *** 238,243 **** void KrBookmarkHandler::importFromFile() { ! //STOPWATCH; ! QFile file( _filename ); if ( !file.open(IO_ReadOnly)) return; // no bookmarks file --- 224,229 ---- void KrBookmarkHandler::importFromFile() { ! QString filename = locateLocal( "data", BOOKMARKS_FILE ); ! QFile file( filename ); if ( !file.open(IO_ReadOnly)) return; // no bookmarks file *************** *** 256,260 **** if (n.isNull() || n.toElement().tagName()!="xbel") { ! errorMsg = _filename+i18n(" doesn't seem to be a valid Bookmarks file"); goto ERROR; } else n = n.firstChild(); // skip the xbel part --- 242,246 ---- if (n.isNull() || n.toElement().tagName()!="xbel") { ! errorMsg = filename+i18n(" doesn't seem to be a valid Bookmarks file"); goto ERROR; } else n = n.firstChild(); // skip the xbel part *************** *** 267,272 **** SUCCESS: file.close(); - //buildMenu(_root, _menu); - //STARTWATCH; } --- 253,256 ---- Index: krbookmark.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmark.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krbookmark.h 1 Oct 2004 00:20:58 -0000 1.4 --- krbookmark.h 5 Oct 2004 15:07:32 -0000 1.5 *************** *** 23,27 **** signals: ! void activated(KrBookmark *bookmark); protected slots: --- 23,27 ---- signals: ! void activated(const KURL& url); protected slots: Index: krbookmarkbutton.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkbutton.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** krbookmarkbutton.h 4 Oct 2004 22:50:26 -0000 1.3 --- krbookmarkbutton.h 5 Oct 2004 15:07:32 -0000 1.4 *************** *** 9,19 **** public: KrBookmarkButton(QWidget *parent); - KrBookmarkHandler *handler() const { return _handler; } signals: void openUrl(const KURL &url); private: - KrBookmarkHandler *_handler; KActionMenu *acmBookmarks; }; --- 9,20 ---- public: KrBookmarkButton(QWidget *parent); signals: void openUrl(const KURL &url); + + protected slots: + void populate(); private: KActionMenu *acmBookmarks; }; Index: krbookmarkhandler.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** krbookmarkhandler.h 5 Oct 2004 09:30:26 -0000 1.7 --- krbookmarkhandler.h 5 Oct 2004 15:07:32 -0000 1.8 *************** *** 10,14 **** class KActionCollection; - class KDirWatch; class KrBookmarkHandler: public QObject { --- 10,13 ---- *************** *** 34,51 **** void buildMenu(KrBookmark *parent, KPopupMenu *menu); - signals: - void openUrl(const KURL& url); - protected slots: - void bookmarkActivated(KrBookmark *bm); void menuOperation(int id); void bookmarksUpdated(const QString &); private: - KPopupMenu *_menu; KActionCollection *_collection; KrBookmark *_root; - KDirWatch *_dirwatch; - QString _filename; }; --- 33,43 ---- Index: krbookmarkbutton.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkbutton.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krbookmarkbutton.cpp 4 Oct 2004 22:50:26 -0000 1.4 --- krbookmarkbutton.cpp 5 Oct 2004 15:07:32 -0000 1.5 *************** *** 7,10 **** --- 7,11 ---- #include <klocale.h> #include <kpopupmenu.h> + #include <kdebug.h> KrBookmarkButton::KrBookmarkButton(QWidget *parent): QToolButton(parent) { *************** *** 18,24 **** acmBookmarks = new KActionMenu(i18n("Bookmarks"), "bookmark", 0, 0); acmBookmarks->setDelayed(false); - //_handler = new KrBookmarkHandler(this, acmBookmarks->popupMenu()); setPopup(acmBookmarks->popupMenu()); } --- 19,30 ---- acmBookmarks = new KActionMenu(i18n("Bookmarks"), "bookmark", 0, 0); acmBookmarks->setDelayed(false); + acmBookmarks->popupMenu()->setKeyboardShortcutsEnabled(true); + acmBookmarks->popupMenu()->setKeyboardShortcutsExecute(true); setPopup(acmBookmarks->popupMenu()); + connect(this, SIGNAL(pressed()), this, SLOT(populate())); } + void KrBookmarkButton::populate() { + krBookMan->populate(static_cast<KPopupMenu*>(popup())); + } Index: krbookmark.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmark.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** krbookmark.cpp 1 Oct 2004 00:20:58 -0000 1.4 --- krbookmark.cpp 5 Oct 2004 15:07:32 -0000 1.5 *************** *** 34,37 **** void KrBookmark::activatedProxy() { ! emit activated(this); } --- 34,37 ---- void KrBookmark::activatedProxy() { ! emit activated(url()); } |
|
From: Shie E. <er...@us...> - 2004-10-05 09:31:18
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4185/krusader/BookMan Modified Files: krbookmarkhandler.cpp Log Message: fixed: crash at startup Index: krbookmarkhandler.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krbookmarkhandler.cpp 4 Oct 2004 22:50:26 -0000 1.6 --- krbookmarkhandler.cpp 5 Oct 2004 09:30:41 -0000 1.7 *************** *** 23,29 **** #define STARTWATCH _dirwatch->restartDirScan(_filename) ! KrBookmarkHandler::KrBookmarkHandler(QObject *parent): QObject(parent) { // create our own action collection and make the shortcuts apply only to parent ! _collection = new KActionCollection(0, parent, "bookmark collection"); // create _root: father of all bookmarks. it is a dummy bookmark and never shown --- 23,29 ---- #define STARTWATCH _dirwatch->restartDirScan(_filename) ! KrBookmarkHandler::KrBookmarkHandler(): QObject(0) { // create our own action collection and make the shortcuts apply only to parent ! _collection = new KActionCollection(0, this, "bookmark collection"); // create _root: father of all bookmarks. it is a dummy bookmark and never shown *************** *** 31,34 **** --- 31,35 ---- // load bookmarks and populate the menu + _filename = locateLocal( "data", BOOKMARKS_FILE ); importFromFile(); } *************** *** 235,240 **** } void KrBookmarkHandler::importFromFile() { ! STOPWATCH; QFile file( _filename ); if ( !file.open(IO_ReadOnly)) --- 236,242 ---- } + void KrBookmarkHandler::importFromFile() { ! //STOPWATCH; QFile file( _filename ); if ( !file.open(IO_ReadOnly)) *************** *** 265,270 **** SUCCESS: file.close(); ! buildMenu(_root, _menu); ! STARTWATCH; } --- 267,277 ---- SUCCESS: file.close(); ! //buildMenu(_root, _menu); ! //STARTWATCH; ! } ! ! void KrBookmarkHandler::populate(KPopupMenu *menu) { ! menu->clear(); ! buildMenu(_root, menu); } *************** *** 274,281 **** KPopupMenu *newMenu = new KPopupMenu(menu); menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), ! bm->text(), newMenu, BOTTOM_OF_MENU); buildMenu(bm, newMenu); } else { ! bm->plug(menu, BOTTOM_OF_MENU); // add on top CONNECT_BM(bm); } --- 281,289 ---- KPopupMenu *newMenu = new KPopupMenu(menu); menu->insertItem(QIconSet(krLoader->loadIcon("bookmark_folder", KIcon::Small)), ! bm->text(), newMenu); buildMenu(bm, newMenu); } else { ! kdWarning() << "Adding " << bm->text() << endl; ! bm->plug(menu); // add on top CONNECT_BM(bm); } |
|
From: Shie E. <er...@us...> - 2004-10-05 09:31:07
|
Update of /cvsroot/krusader/krusader_kde3/krusader/BookMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4138/krusader/BookMan Modified Files: krbookmarkhandler.h Log Message: fixed: crash at startup Index: krbookmarkhandler.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** krbookmarkhandler.h 4 Oct 2004 22:50:26 -0000 1.6 --- krbookmarkhandler.h 5 Oct 2004 09:30:26 -0000 1.7 *************** *** 17,22 **** enum Actions { Border, BookmarkCurrent, ManageBookmarks }; public: ! KrBookmarkHandler(QObject *parent); KrBookmarkHandler(QWidget *parent, KPopupMenu *menu); protected: --- 17,23 ---- enum Actions { Border, BookmarkCurrent, ManageBookmarks }; public: ! KrBookmarkHandler(); KrBookmarkHandler(QWidget *parent, KPopupMenu *menu); + void populate(KPopupMenu *menu); protected: |
|
From: Shie E. <er...@us...> - 2004-10-05 09:30:10
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3926/krusader Modified Files: krusader.cpp Log Message: fixed: crash at startup Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** krusader.cpp 5 Oct 2004 00:39:47 -0000 1.92 --- krusader.cpp 5 Oct 2004 09:29:44 -0000 1.93 *************** *** 210,214 **** // create bookman ! bookman = new KrBookmarkHandler(this); // setup all the krusader's actions --- 210,214 ---- // create bookman ! bookman = new KrBookmarkHandler(); // setup all the krusader's actions |
|
From: Karai C. <ck...@us...> - 2004-10-05 03:35:58
|
Update of /cvsroot/krusader/krusader_kde3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26700/krusader_kde3 Modified Files: ChangeLog Log Message: ADDED: first feature complete version of krusader profiles Index: ChangeLog =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v retrieving revision 1.312 retrieving revision 1.313 diff -C2 -d -r1.312 -r1.313 *** ChangeLog 2 Oct 2004 16:22:44 -0000 1.312 --- ChangeLog 5 Oct 2004 03:35:47 -0000 1.313 *************** *** 1,3 **** --- 1,4 ---- ====================== + ADDED: profiles for the panels ADDED: mkdir (F7) can now create whole trees on the fly ("foo/bar/test") ADDED: synchronizer uses the search filters |
|
From: Karai C. <ck...@us...> - 2004-10-05 03:35:58
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26700/krusader_kde3/krusader Modified Files: panelmanager.cpp Log Message: ADDED: first feature complete version of krusader profiles Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** panelmanager.cpp 5 Oct 2004 00:39:47 -0000 1.17 --- panelmanager.cpp 5 Oct 2004 03:35:48 -0000 1.18 *************** *** 111,119 **** PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); if (t && t->panel) ! t->panel->start( l[ i ] ); ++i; } ! /*while( i < totalTabs ) ---- CURRENTLY CRASHES ---- { PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt( --totalTabs )); --- 111,123 ---- PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); if (t && t->panel) ! { ! _tabbar->setCurrentTab( t ); ! slotChangePanel( t->panel ); ! t->panel->start( l[ i ] ); ! } ++i; } ! while( i < totalTabs ) { PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt( --totalTabs )); *************** *** 124,128 **** slotCloseTab(); } ! }*/ for(; i < (int)l.count(); i++ ) --- 128,132 ---- slotCloseTab(); } ! } for(; i < (int)l.count(); i++ ) |
|
From: Karai C. <ck...@us...> - 2004-10-05 00:40:00
|
Update of /cvsroot/krusader/krusader_kde3/krusader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21080/krusader_kde3/krusader Modified Files: krslots.cpp krslots.h krusader.cpp krusader.h krusaderui.rc panelmanager.cpp panelmanager.h Log Message: ADDED: panel profiles, initial version (no tab delete, because of crash) Index: krusader.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** krusader.h 4 Oct 2004 22:50:26 -0000 1.30 --- krusader.h 5 Oct 2004 00:39:47 -0000 1.31 *************** *** 102,106 **** static KAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate; static KAction *actUnselectAll, *actInvert, *actSync, *actSavePosition, *actCompDirs; ! static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels; static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; --- 102,106 ---- static KAction *actCalculate, *actSelect, *actUnselect, *actSelectAll, *actLocate; static KAction *actUnselectAll, *actInvert, *actSync, *actSavePosition, *actCompDirs; ! static KAction *actHomeTerminal, *actFTPConnect, *actFTPNewConnect, *actFTPDisconnect, *actProfiles; static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels; static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp; Index: krusaderui.rc =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** krusaderui.rc 30 Aug 2004 20:37:38 -0000 1.19 --- krusaderui.rc 5 Oct 2004 00:39:47 -0000 1.20 *************** *** 50,53 **** --- 50,54 ---- <Action name="ftp connect" /> <Action name="ftp new connection" /> + <Action name="profile" /> <Action name="user menu" /> </Menu> *************** *** 55,60 **** <text>&View</text> <Separator/> - <Action name="compare mode" /> - <Action name="select colormask" /> <Action name="toggle hidden files" /> <Action name="toggle swap panels" /> --- 56,59 ---- *************** *** 108,111 **** --- 107,111 ---- <Action name="ftp connect" /> <Action name="ftp new connection" /> + <Action name="profile" /> <Separator name="separator_0" /> <Action name="konfigurator" /> Index: krslots.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** krslots.cpp 17 Sep 2004 17:10:15 -0000 1.63 --- krslots.cpp 5 Oct 2004 00:39:47 -0000 1.64 *************** *** 76,79 **** --- 76,80 ---- #include "Synchronizer/synchronizergui.h" #include "krservices.h" + #include "GUI/profilemanager.h" #define REFRESH_BOTH_PANELS { ListPanel *p=ACTIVE_PANEL; \ *************** *** 770,772 **** --- 771,810 ---- } + void KRslots::profiles() + { + ProfileManager profileManager( "Panel" ); + profileManager.hide(); + connect( &profileManager, SIGNAL( saveToProfile( QString ) ), this, SLOT( savePanelProfiles( QString ) ) ); + connect( &profileManager, SIGNAL( loadFromProfile( QString ) ), this, SLOT( loadPanelProfiles( QString ) ) ); + profileManager.profilePopup(); + } + + void KRslots::loadPanelProfiles( QString group ) + { + krConfig->setGroup( group ); + MAIN_VIEW->leftMng->loadSettings( krConfig, "Left Tabs" ); + krConfig->setGroup( group ); + MAIN_VIEW->leftMng->setActiveTab( krConfig->readNumEntry( "Left Active Tab", 0 ) ); + krConfig->setGroup( group ); + MAIN_VIEW->rightMng->loadSettings( krConfig, "Right Tabs" ); + krConfig->setGroup( group ); + MAIN_VIEW->rightMng->setActiveTab( krConfig->readNumEntry( "Right Active Tab", 0 ) ); + krConfig->setGroup( group ); + if( krConfig->readBoolEntry( "Left Side Is Active", true ) ) + MAIN_VIEW->left->slotFocusOnMe(); + else + MAIN_VIEW->right->slotFocusOnMe(); + } + + void KRslots::savePanelProfiles( QString group ) + { + krConfig->setGroup( group ); + + MAIN_VIEW->leftMng->saveSettings( krConfig, "Left Tabs" ); + krConfig->writeEntry( "Left Active Tab", MAIN_VIEW->leftMng->activeTab() ); + MAIN_VIEW->rightMng->saveSettings( krConfig, "Right Tabs" ); + krConfig->writeEntry( "Right Active Tab", MAIN_VIEW->rightMng->activeTab() ); + krConfig->writeEntry( "Left Side Is Active", MAIN_VIEW->activePanel->isLeft() ); + } + #include "krslots.moc" Index: panelmanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** panelmanager.cpp 31 Aug 2004 23:46:38 -0000 1.16 --- panelmanager.cpp 5 Oct 2004 00:39:47 -0000 1.17 *************** *** 89,103 **** QStringList l; int i=0, cnt=0; ! while (cnt < _tabbar->count()) { ! PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); ! if (t && t->panel) { ! l << t->panel->realPath; ! ++cnt; ! } ! ++i; ! } config->writePathEntry( key, l ); } void PanelManager::slotNewTab() { --- 89,134 ---- QStringList l; int i=0, cnt=0; ! while (cnt < _tabbar->count()) { ! PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); ! if (t && t->panel) { ! l << t->panel->realPath; ! ++cnt; ! } ! ++i; ! } config->writePathEntry( key, l ); } + void PanelManager::loadSettings( KConfig *config, const QString& key ) { + QStringList l = config->readPathListEntry( key ); + if( l.count() < 1 ) + return; + + int i=0, totalTabs = _tabbar->count(); + + while (i < totalTabs && i < (int)l.count() ) + { + PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt(i)); + if (t && t->panel) + t->panel->start( l[ i ] ); + ++i; + } + + /*while( i < totalTabs ) ---- CURRENTLY CRASHES ---- + { + PanelTab *t = dynamic_cast<PanelTab*>(_tabbar->tabAt( --totalTabs )); + if (t && t->panel) + { + _tabbar->setCurrentTab( _tabbar->tabAt( totalTabs ) ); + slotChangePanel( t->panel ); + slotCloseTab(); + } + }*/ + + for(; i < (int)l.count(); i++ ) + { + slotNewTab( l[i] ); + } + } void PanelManager::slotNewTab() { Index: krusader.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** krusader.cpp 4 Oct 2004 22:50:26 -0000 1.91 --- krusader.cpp 5 Oct 2004 00:39:47 -0000 1.92 *************** *** 108,111 **** --- 108,112 ---- KAction *Krusader::actFTPNewConnect = 0; KAction *Krusader::actFTPDisconnect = 0; + KAction *Krusader::actProfiles = 0; KAction *Krusader::actMultiRename = 0; KAction *Krusader::actAllFilter = 0; *************** *** 454,457 **** --- 455,460 ---- actFTPNewConnect = new KAction( i18n( "New Net &Connection" ), "connect_creating", CTRL + Key_N, SLOTS, SLOT( newFTPconnection() ), actionCollection(), "ftp new connection" ); + actProfiles = new KAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L, + SLOTS, SLOT( profiles() ), actionCollection(), "profile" ); actCalculate = new KAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0, SLOTS, SLOT( calcSpace() ), actionCollection(), "calculate" ); Index: krslots.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** krslots.h 15 Sep 2004 12:11:16 -0000 1.29 --- krslots.h 5 Oct 2004 00:39:47 -0000 1.30 *************** *** 102,105 **** --- 102,106 ---- void runMountMan(); void runRemoteMan(); + void profiles(); void toggleFnkeys(); void toggleCmdline(); *************** *** 147,150 **** --- 148,154 ---- void slotCurrentChanged( QString p ) { krApp->mainView->slotCurrentChanged( p ); } void slotSetActivePanel( ListPanel *p ) { krApp->mainView->slotSetActivePanel( p ); } + + void loadPanelProfiles( QString group ); + void savePanelProfiles( QString group ); }; Index: panelmanager.h =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** panelmanager.h 28 Aug 2004 21:51:07 -0000 1.10 --- panelmanager.h 5 Oct 2004 00:39:47 -0000 1.11 *************** *** 44,47 **** --- 44,48 ---- void saveSettings(KConfig *config, const QString& key); + void loadSettings(KConfig *config, const QString& key); int activeTab(); void setActiveTab( int ); |
|
From: Karai C. <ck...@us...> - 2004-10-05 00:40:00
|
Update of /cvsroot/krusader/krusader_kde3/pics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21080/krusader_kde3/pics Modified Files: Makefile.am Added Files: kr_profile16x16.png kr_profile22x22.png kr_profile32x32.png Log Message: ADDED: panel profiles, initial version (no tab delete, because of crash) --- NEW FILE: kr_profile32x32.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kr_profile22x22.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: kr_profile16x16.png --- (This appears to be a binary file; contents omitted.) Index: Makefile.am =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/pics/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 26 Jul 2004 22:21:25 -0000 1.6 --- Makefile.am 5 Oct 2004 00:39:48 -0000 1.7 *************** *** 171,174 **** --- 171,180 ---- $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/16x16/actions/ $(INSTALL_DATA) $(srcdir)/kr_syncbrowse_on16x16.png $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_on.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/16x16/actions/ + $(INSTALL_DATA) $(srcdir)/kr_profile16x16.png $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_profile.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/22x22/actions/ + $(INSTALL_DATA) $(srcdir)/kr_profile22x22.png $(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_profile.png + $(mkinstalldirs) $(kde_datadir)/krusader/icons/hicolor/32x32/actions/ + $(INSTALL_DATA) $(srcdir)/kr_profile32x32.png $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_profile.png uninstall-local: *************** *** 256,259 **** --- 262,268 ---- -rm -f $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_off.png -rm -f $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_on.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/16x16/actions/kr_profile.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/22x22/actions/kr_profile.png + -rm -f $(kde_datadir)/krusader/icons/hicolor/32x32/actions/kr_profile.png ####### kdevelop will overwrite this part!!! (end)############ |
|
From: Karai C. <ck...@us...> - 2004-10-05 00:39:59
|
Update of /cvsroot/krusader/krusader_kde3/krusader/GUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21080/krusader_kde3/krusader/GUI Modified Files: profilemanager.cpp Log Message: ADDED: panel profiles, initial version (no tab delete, because of crash) Index: profilemanager.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/profilemanager.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** profilemanager.cpp 27 Sep 2004 17:18:54 -0000 1.1 --- profilemanager.cpp 5 Oct 2004 00:39:47 -0000 1.2 *************** *** 37,181 **** #include <qcursor.h> #include <kinputdialog.h> ! ! static const char * const profiles_data[] = { ! "20 20 111 2", ! " g None", ! ". g #B9B9B9", ! "+ g #BEBEBE", ! "@ g #C7C7C7", ! "# g #C4C4C4", ! "$ g #CECECE", ! "% g #B7B7B7", ! "& g #A1A1A1", ! "* g #C1C1C1", ! "= g #ADADAD", ! "- g #A5A5A5", ! "; g #AAAAAA", ! "> g #CACACA", ! ", g #B0B0B0", ! "' g #ACACAC", ! ") g #CCCCCC", ! "! g #ABABAB", ! "~ g #B3B3B3", ! "{ g #AFAFAF", ! "] g #CDCDCD", ! "^ g #B6B6B6", ! "/ g #A9A9A9", ! "( g #B4B4B4", ! "_ g #888888", ! ": g #7A7A7A", ! "< g #858585", ! "[ g #9B9B9B", ! "} g #898989", ! "| g #9C9C9C", ! "1 g #A8A8A8", ! "2 g #B1B1B1", ! "3 g #989898", ! "4 g #959595", ! "5 g #8B8B8B", ! "6 g #8E8E8E", ! "7 g #9D9D9D", ! "8 g #8C8C8C", ! "9 g #808080", ! "0 g #7F7F7F", ! "a g #B5B5B5", ! "b g #848484", ! "c g #5C5C5C", ! "d g #565656", ! "e g #656565", ! "f g #999999", ! "g g #9E9E9E", ! "h g #8A8A8A", ! "i g #B8B8B8", ! "j g #C8C8C8", ! "k g #A4A4A4", ! "l g #868686", ! "m g #B2B2B2", ! "n g #111111", ! "o g #000000", ! "p g #020202", ! "q g #353535", ! "r g #9F9F9F", ! "s g #969696", ! "t g #8D8D8D", ! "u g #919191", ! "v g #9A9A9A", ! "w g #090909", ! "x g #212121", ! "y g #A6A6A6", ! "z g #646464", ! "A g #929292", ! "B g #4F4F4F", ! "C g #181818", ! "D g #C5C5C5", ! "E g #7C7C7C", ! "F g #191919", ! "G g #0F0F0F", ! "H g #BDBDBD", ! "I g #909090", ! "J g #C0C0C0", ! "K g #BABABA", ! "L g #333333", ! "M g #1A1A1A", ! "N g #AEAEAE", ! "O g #D1D1D1", ! "P g #555555", ! "Q g #585858", ! "R g #A7A7A7", ! "S g #626262", ! "T g #242424", ! "U g #C3C3C3", ! "V g #A2A2A2", ! "W g #7E7E7E", ! "X g #151515", ! "Y g #CBCBCB", ! "Z g #7D7D7D", ! "` g #040404", ! " . g #010101", ! ".. g #CFCFCF", ! "+. g #A3A3A3", ! "@. g #979797", ! "#. g #030303", ! "$. g #939393", ! "%. g #8F8F8F", ! "&. g #C9C9C9", ! "*. g #7B7B7B", ! "=. g #878787", ! "-. g #414141", ! ";. g #3E3E3E", ! ">. g #3F3F3F", ! ",. g #949494", ! "'. g #838383", ! "). g #C6C6C6", ! "!. g #D4D4D4", ! "~. g #D2D2D2", ! "{. g #BCBCBC", ! " . + @ # ", ! "$ % & * = - ; > , ' ; ) ! ~ { ] ^ / ' ", ! " ( _ : < [ } | 1 % / 2 3 & _ [ 4 5 6 ) ", ! " 7 8 9 0 5 1 a b c d e f + g h } 6 i ", ! "j k l h } m h n o o o o p q ( r l < s # ", ! " [ t u v 1 w o o o o o o o x ^ 7 : y ", ! " ; 5 b ; z o o o o o o o o o d , 9 A j ", ! " y < l ^ B o o o o o o o o o C a t a ", ! "D y E & . F o o o o o o o o o G H I | J ", ! " A h K L o o o o o o o o o o M J I N ", ! "O ( 4 K P o o o o o o o o o o Q ^ 6 - j ", ! " R t 2 S o o o o o o o o o T H 7 5 K ", ! "U V W y W o o o o o o o o X , R l s u Y ", ! " | I N Z ` .o o o o o o < ; < h I g ", ! "..+.Z @.i ( t X o o o o #.; $.b _ %.@.&.", ! " 3 *.9 %.u { Z o o o o o =.V u 6 t ~ ", ! "* f _ 0 9 %.f 2 -.;.>.;.;.: ~ ,.t A V &.", ! " $.l ,.'.< ,.J % a ( U K i ' f : < +. ", ! "..{ 8 + - | 9 + V 3 u ).{ k %.H +.g 1 ", ! " + ..# U !.) D ~.] {.] .. "}; ProfileManager::ProfileManager( QString profileType, QWidget * parent, const char * name ) : QPushButton( parent, name ) { - QPixmap profiles( ( const char** ) profiles_data ); setText( "" ); ! setPixmap( profiles ); QToolTip::add( this, i18n( "Profiles" ) ); --- 37,48 ---- #include <qcursor.h> #include <kinputdialog.h> ! #include <kiconloader.h> ProfileManager::ProfileManager( QString profileType, QWidget * parent, const char * name ) : QPushButton( parent, name ) { setText( "" ); ! KIconLoader *iconLoader = new KIconLoader(); ! setPixmap( iconLoader->loadIcon( "kr_profile", KIcon::Toolbar, 16 ) ); QToolTip::add( this, i18n( "Profiles" ) ); |
7 messages has been excluded from this view by a project administrator.
