krusader-commits

[Krusader-commits] krusader_kde3 ChangeLog,1.109,1.110

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv18523

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** ChangeLog	3 Oct 2003 08:19:10 -0000	1.109
--- ChangeLog	3 Oct 2003 08:19:32 -0000	1.110
***************
*** 11,15 ****
      ADDED: ctrl-left/right arrow checks if we're on a folder, if so it refreshes the other panel with the contents
             of the folder, otherwise to the same path as current one (Wincmd style)
!     ADDED: tabbed-browsing beta ---> memory leak? listpanel doesn't seem to be deleted (using top to check)
      ADDED: SHIFT-F3 view dialog.
      ADDED: The internal viewer follow links on HTML pages.
--- 11,15 ----
      ADDED: ctrl-left/right arrow checks if we're on a folder, if so it refreshes the other panel with the contents
             of the folder, otherwise to the same path as current one (Wincmd style)
!     ADDED: tabbed-browsing beta
      ADDED: SHIFT-F3 view dialog.
      ADDED: The internal viewer follow links on HTML pages.

[Krusader-commits] krusader_kde3 ChangeLog,1.108,1.109

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv18469

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ChangeLog	1 Oct 2003 13:17:50 -0000	1.108
--- ChangeLog	3 Oct 2003 08:19:10 -0000	1.109
***************
*** 1,13 ****
  ======================
      ADDED: KrSearch Match whole word only feature
-     FIXED: KrSearch does not find texts at the last row
-     FIXED: Strange KrSearch GUI (SearchIn and DontSearchIn adding)
-     FIXED: KrSearch crash at pressing Escape or Closing the window during search
      ADDED: Tab-browsing shortens tabs when more tabs are created
-     FIXED:
-     FIXED: cmdline would start-up focused on the wrong panel
-     FIXED: when pressing ctrl-enter (or ctrl-shift-enter), focus goes to command line
      ADDED: Starting Krusader with root privileges by pressing Alt+K
-     FIXED: Terminal Emulator bug at ` and Backspace keys
      ADDED: Open-in-a-new-tab available in right-click menu
      ADDED: Creating new files with SHIFT+F4
--- 1,7 ----
+ 1.29-beta
  ======================
      ADDED: KrSearch Match whole word only feature
      ADDED: Tab-browsing shortens tabs when more tabs are created
      ADDED: Starting Krusader with root privileges by pressing Alt+K
      ADDED: Open-in-a-new-tab available in right-click menu
      ADDED: Creating new files with SHIFT+F4
***************
*** 18,22 ****
             of the folder, otherwise to the same path as current one (Wincmd style)
      ADDED: tabbed-browsing beta ---> memory leak? listpanel doesn't seem to be deleted (using top to check)
-     FIXED: internal editor / viewer crash at invalid symlinks
      ADDED: SHIFT-F3 view dialog.
      ADDED: The internal viewer follow links on HTML pages.
--- 12,15 ----
***************
*** 31,34 ****
--- 24,34 ----
      ADDED: open with in the right click menu for multiple files with the same mimetype.
      ADDED: Patch by Heiner <h.eichmann_at_gmx.de>  which adds a cancel button to the calculate space action.
+     FIXED: KrSearch does not find texts at the last row
+     FIXED: Strange KrSearch GUI (SearchIn and DontSearchIn adding)
+     FIXED: KrSearch crash at pressing Escape or Closing the window during search
+     FIXED: cmdline would start-up focused on the wrong panel
+     FIXED: when pressing ctrl-enter (or ctrl-shift-enter), focus goes to command line
+     FIXED: Terminal Emulator bug at ` and Backspace keys
+     FIXED: internal editor / viewer crash at invalid symlinks
      FIXED: run-in-terminal would cause the terminal to close prematuraly and results would be lost.
      FIXED: free disk capacity miscalculation for Ext2 and Ext3 file systems.

[Krusader-commits] krusader_kde3/krusader/GUI kcmdline.cpp,1.16,1.17

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv18279/krusader/GUI

Modified Files:
	kcmdline.cpp 
Log Message:
Removed a kdDebug line

Index: kcmdline.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** kcmdline.cpp	29 Sep 2003 19:36:19 -0000	1.16
--- kcmdline.cpp	3 Oct 2003 08:18:18 -0000	1.17
***************
*** 119,123 ****
     KConfigGroupSaver grpSvr( krConfig, "Private" );
     QStringList list = cmdLine->historyItems();
!    kdWarning() << list[0] << endl;
     krConfig->writeEntry( "cmdline history", list );
     krConfig->sync();
--- 119,123 ----
     KConfigGroupSaver grpSvr( krConfig, "Private" );
     QStringList list = cmdLine->historyItems();
!    //kdWarning() << list[0] << endl;
     krConfig->writeEntry( "cmdline history", list );
     krConfig->sync();

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.39,1.40

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv13335/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** listpanel.cpp	2 Oct 2003 19:54:14 -0000	1.39
--- listpanel.cpp	3 Oct 2003 08:04:41 -0000	1.40
***************
*** 174,179 ****
  }
  
! ListPanel::~ListPanel(){
    delete func;
  }
  
--- 174,186 ----
  }
  
! ListPanel::~ListPanel() {
    delete func;
+   delete view;
+   delete status;
+   delete bookmarksButton;
+   delete totals;
+   delete quickSearch;
+   delete origin;
+   delete layout;
  }
  

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.45,1.46

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv13158/krusader/Panel

Modified Files:
	krdetailedview.cpp 
Log Message:
 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** krdetailedview.cpp	29 Sep 2003 15:44:36 -0000	1.45
--- krdetailedview.cpp	3 Oct 2003 08:03:49 -0000	1.46
***************
*** 54,74 ****
  //
  // Ext Column
! #define _ExtColumn          true 
  // Mime Column
! #define _MimeColumn         false 
  // Size Column
! #define _SizeColumn         true 
  // DateTime Column
! #define _DateTimeColumn     true 
  // Perm Column
! #define _PermColumn         false 
  // KrPerm Column
! #define _KrPermColumn       true 
  // Owner Column
! #define _OwnerColumn        false 
  // Group Column
! #define _GroupColumn        false 
  // Do Quicksearch
! #define _DoQuicksearch      true 
  // Classic Quicksearch
  #define _ClassicQuicksearch true 
--- 54,74 ----
  //
  // Ext Column
! #define _ExtColumn          true
  // Mime Column
! #define _MimeColumn         false
  // Size Column
! #define _SizeColumn         true
  // DateTime Column
! #define _DateTimeColumn     true
  // Perm Column
! #define _PermColumn         false
  // KrPerm Column
! #define _KrPermColumn       true
  // Owner Column
! #define _OwnerColumn        false
  // Group Column
! #define _GroupColumn        false
  // Do Quicksearch
! #define _DoQuicksearch      true
  // Classic Quicksearch
  #define _ClassicQuicksearch true 

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.h,1.15,1.16

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv13116/krusader/Panel

Modified Files:
	krdetailedview.h 
Log Message:
 

Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** krdetailedview.h	22 Sep 2003 17:31:47 -0000	1.15
--- krdetailedview.h	3 Oct 2003 08:03:21 -0000	1.16
***************
*** 58,72 ****
  
      KrDetailedView( QWidget *parent, bool left, KConfig *cfg = krConfig, const char *name = 0 );
!     ~KrDetailedView();
      virtual int column( ColumnType type );
!     KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); }
!     KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemBelow() ); }
!     KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemAbove() ); }
!     KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>( currentItem() ); }
      virtual KrViewItem *getKrViewItemAt( const QPoint &vp );
      virtual void addItems( vfs *v, bool addUpDir = true );
!     QString getCurrentItem() const;
!     void makeItemVisible( const KrViewItem *item ) { ensureItemVisible( dynamic_cast<const QListViewItem*>( item ) ); }
!     void setCurrentItem( const QString& name );
      virtual void updateView() { triggerUpdate(); emit selectionChanged(); }
      virtual void clear();
--- 58,72 ----
  
      KrDetailedView( QWidget *parent, bool left, KConfig *cfg = krConfig, const char *name = 0 );
!     virtual ~KrDetailedView();
      virtual int column( ColumnType type );
!     virtual KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); }
!     virtual KrViewItem *getNext( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemBelow() ); }
!     virtual KrViewItem *getPrev( KrViewItem *current ) { return dynamic_cast<KrViewItem*>( dynamic_cast<KListViewItem*>( current ) ->itemAbove() ); }
!     virtual KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>( currentItem() ); }
      virtual KrViewItem *getKrViewItemAt( const QPoint &vp );
      virtual void addItems( vfs *v, bool addUpDir = true );
!     virtual QString getCurrentItem() const;
!     virtual void makeItemVisible( const KrViewItem *item ) { ensureItemVisible( dynamic_cast<const QListViewItem*>( item ) ); }
!     virtual void setCurrentItem( const QString& name );
      virtual void updateView() { triggerUpdate(); emit selectionChanged(); }
      virtual void clear();
***************
*** 78,82 ****
      virtual void restoreSettings() { KListView::restoreLayout( _config, nameInKConfig() ); }
      virtual QString nameInKConfig() { return _nameInKConfig; }
!     QString itemToFilename( QListViewItem *it ) { return dynamic_cast<KrViewItem*>( it ) ->name(); } //remove
      virtual void renameCurrentItem();
  
--- 78,82 ----
      virtual void restoreSettings() { KListView::restoreLayout( _config, nameInKConfig() ); }
      virtual QString nameInKConfig() { return _nameInKConfig; }
!     virtual QString itemToFilename( QListViewItem *it ) { return dynamic_cast<KrViewItem*>( it ) ->name(); } //remove
      virtual void renameCurrentItem();
  

[Krusader-commits] krusader_kde3/krusader/Panel krview.h,1.6,1.7

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv13077/krusader/Panel

Modified Files:
	krview.h 
Log Message:
 

Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krview.h	19 Sep 2003 22:35:32 -0000	1.6
--- krview.h	3 Oct 2003 08:03:05 -0000	1.7
***************
*** 140,146 ****
  
    // todo: what about selection modes ???
  protected:
    KrView(KConfig *cfg = krConfig);
-   virtual ~KrView() {}
    static QPixmap getIcon(vfile *vf);
    void changeSelection(const QString& filter, bool select);
--- 140,146 ----
  
    // todo: what about selection modes ???
+   virtual ~KrView() {}
  protected:
    KrView(KConfig *cfg = krConfig);
    static QPixmap getIcon(vfile *vf);
    void changeSelection(const QString& filter, bool select);

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.38,1.39

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv5802/krusader

Modified Files:
	krusader.cpp 
Log Message:
Delete the PanelFunc in the ListPanel Destructor


Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** krusader.cpp	29 Sep 2003 18:58:09 -0000	1.38
--- krusader.cpp	2 Oct 2003 19:54:14 -0000	1.39
***************
*** 503,508 ****
    if (quit) {
      // close all open VFS
!     delete krApp->mainView->left->func;
!     delete krApp->mainView->right->func;
      saveSettings();
      delete krApp->mainView;
--- 503,508 ----
    if (quit) {
      // close all open VFS
!     //delete krApp->mainView->left->func;
!     //delete krApp->mainView->right->func;
      saveSettings();
      delete krApp->mainView;

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.38,1.39 listpanel.h,1.10,1.11 panelfunc.cpp,1.37,1.38

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv5802/krusader/Panel

Modified Files:
	listpanel.cpp listpanel.h panelfunc.cpp 
Log Message:
Delete the PanelFunc in the ListPanel Destructor


Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** listpanel.cpp	29 Sep 2003 18:43:35 -0000	1.38
--- listpanel.cpp	2 Oct 2003 19:54:14 -0000	1.39
***************
*** 174,177 ****
--- 174,181 ----
  }
  
+ ListPanel::~ListPanel(){
+   delete func;
+ }
+ 
  void ListPanel::slotUpdateTotals() {
    totals->setText( view->statistics() );

Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** listpanel.h	19 Sep 2003 16:21:54 -0000	1.10
--- listpanel.h	2 Oct 2003 19:54:14 -0000	1.11
***************
*** 73,77 ****
    // constructor create the panel, but DOESN'T fill it with data, use start()
    ListPanel(QWidget *parent, bool left, const char *name=0);
!  ~ListPanel(){}
    void start(QString path = QString::null);
    inline QString getPath(){return virtualPath;}
--- 73,77 ----
    // constructor create the panel, but DOESN'T fill it with data, use start()
    ListPanel(QWidget *parent, bool left, const char *name=0);
!  ~ListPanel();
    void start(QString path = QString::null);
    inline QString getPath(){return virtualPath;}

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** panelfunc.cpp	19 Sep 2003 22:35:32 -0000	1.37
--- panelfunc.cpp	2 Oct 2003 19:54:14 -0000	1.38
***************
*** 1017,1022 ****
    // clear the view - to avoid a repaint crash
    panel->view->clear();
!   while ( vfsStack.remove() )
!     ; // delete all vfs objects
  }
  
--- 1017,1021 ----
    // clear the view - to avoid a repaint crash
    panel->view->clear();
!   while ( vfsStack.remove() ); // delete all vfs objects
  }
  

[Krusader-commits] krusader_kde3/po ru.po,1.1,1.2

[<des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1:/tmp/cvs-serv27233/po

Modified Files:
	ru.po 
Log Message:


Index: ru.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ru.po	24 Sep 2003 14:39:21 -0000	1.1
--- ru.po	1 Oct 2003 14:36:22 -0000	1.2
***************
*** 9,13 ****
  "Project-Id-Version: ru\n"
  "POT-Creation-Date: 2003-08-01 13:49+0300\n"
! "PO-Revision-Date: 2003-09-24 14:55+0300\n"
  "Last-Translator: Dmitry V. Chernyak <dv...@ma...>\n"
  "Language-Team: Russian <ru...@li...>\n"
--- 9,13 ----
  "Project-Id-Version: ru\n"
  "POT-Creation-Date: 2003-08-01 13:49+0300\n"
! "PO-Revision-Date: 2003-10-01 11:52+0300\n"
  "Last-Translator: Dmitry V. Chernyak <dv...@ma...>\n"
  "Language-Team: Russian <ru...@li...>\n"
***************
*** 21,25 ****
  "Well, it's quite simple actually: You write you command in here, and "
  "Krusader obays."
! msgstr ""
  
  #: GUI/kcmdline.cpp:74
--- 21,25 ----
  "Well, it's quite simple actually: You write you command in here, and "
  "Krusader obays."
! msgstr "Это совершенно просто: Вы пишете команду здесь и Krusader ее выполняет."
  
  #: GUI/kcmdline.cpp:74
***************
*** 33,37 ****
  msgstr ""
  "Кнопка истории вызывает меню с 20 последними командами, "
! " введенными в командной строке. Выберите ваш путь..."
  
  #: GUI/kcmdline.cpp:88
--- 33,37 ----
  msgstr ""
  "Кнопка истории вызывает меню с 20 последними командами, "
! " введенными в командной строке. Выберите необходимую..."
  
  #: GUI/kcmdline.cpp:88
***************
*** 63,67 ****
  #: GUI/kfnkeys.cpp:54
  msgid "F5 Copy  "
! msgstr "F5 Копия"
  
  #: GUI/kfnkeys.cpp:57 krusader.cpp:264
--- 63,67 ----
  #: GUI/kfnkeys.cpp:54
  msgid "F5 Copy  "
! msgstr "F5 Копировать"
  
  #: GUI/kfnkeys.cpp:57 krusader.cpp:264
***************
*** 163,167 ****
  #: Panel/krdetailedviewitem.cpp:217
  msgid "%1 (Link)"
! msgstr "%1 (Link)"
  
  #: Panel/krpreviewpopup.cpp:32
--- 163,167 ----
  #: Panel/krdetailedviewitem.cpp:217
  msgid "%1 (Link)"
! msgstr ""
  
  #: Panel/krpreviewpopup.cpp:32
***************
*** 269,287 ****
  #: Panel/listpanel.cpp:567
  msgid "Rename"
! msgstr "Переименование"
  
  #: Panel/listpanel.cpp:573
  msgid "Shred"
! msgstr "Разорвать"
  
  #: Panel/listpanel.cpp:579
- #, fuzzy
  msgid "new symlink"
! msgstr "новый symlink"
  
  #: Panel/listpanel.cpp:580
- #, fuzzy
  msgid "new hardlink"
! msgstr "новый hardlink"
  
  #: Panel/listpanel.cpp:582
--- 269,285 ----
  #: Panel/listpanel.cpp:567
  msgid "Rename"
! msgstr "Переименовать"
  
  #: Panel/listpanel.cpp:573
  msgid "Shred"
! msgstr "Уничтожить"
  
  #: Panel/listpanel.cpp:579
  msgid "new symlink"
! msgstr "новая символьная ссылка"
  
  #: Panel/listpanel.cpp:580
  msgid "new hardlink"
! msgstr "новая жесткая ссылка"
  
  #: Panel/listpanel.cpp:582
***************
*** 291,295 ****
  #: Panel/listpanel.cpp:584
  msgid "Link handling"
! msgstr ""
  
  #: Panel/listpanel.cpp:592 MountMan/kmountmangui.cpp:221
--- 289,293 ----
  #: Panel/listpanel.cpp:584
  msgid "Link handling"
! msgstr "Создать ссылку"
  
  #: Panel/listpanel.cpp:592 MountMan/kmountmangui.cpp:221
***************
*** 311,315 ****
  #: Panel/listpanel.cpp:640
  msgid "Are you sure you want to shred "
! msgstr "Вы уверены, что хотите разорвать "
  
  #: Panel/listpanel.cpp:680 Panel/panelfunc.cpp:293 Panel/panelfunc.cpp:321
--- 309,313 ----
  #: Panel/listpanel.cpp:640
  msgid "Are you sure you want to shred "
! msgstr "Вы уверены, что хотите уничтожить "
  
  #: Panel/listpanel.cpp:680 Panel/panelfunc.cpp:293 Panel/panelfunc.cpp:321
***************
*** 365,369 ****
  
  #: Panel/krview.cpp:116
- #, fuzzy
  msgid "out of"
  msgstr "из"
--- 363,366 ----
***************
*** 411,415 ****
  #: Panel/panelfunc.cpp:234
  msgid "Create a new link to: "
! msgstr "Создать новую ссылку с: "
  
  #: Panel/panelfunc.cpp:242
--- 408,412 ----
  #: Panel/panelfunc.cpp:234
  msgid "Create a new link to: "
! msgstr "Создать новую ссылку на: "
  
  #: Panel/panelfunc.cpp:242
***************
*** 418,424 ****
  
  #: Panel/panelfunc.cpp:254
- #, fuzzy
  msgid "Failed to create a new symlink: "
! msgstr "Неудалось создать новую symlink: "
  
  #: Panel/panelfunc.cpp:255 Panel/panelfunc.cpp:259
--- 415,420 ----
  
  #: Panel/panelfunc.cpp:254
  msgid "Failed to create a new symlink: "
! msgstr "Неудалось создать новую символьную ссылку: "
  
  #: Panel/panelfunc.cpp:255 Panel/panelfunc.cpp:259
***************
*** 624,628 ****
  #: krusader.cpp:261
  msgid "F5 Copy"
! msgstr "F5 Копия"
  
  #: krusader.cpp:267
--- 620,624 ----
  #: krusader.cpp:261
  msgid "F5 Copy"
! msgstr "F5 Копировать"
  
  #: krusader.cpp:267
***************
*** 796,800 ****
  #: krusader.cpp:393
  msgid "Remove selection from all highlight files"
! msgstr "Снять отметку со всех подсвеченных файлов"
  
  #: krusader.cpp:394
--- 792,796 ----
  #: krusader.cpp:393
  msgid "Remove selection from all highlight files"
! msgstr "Снять отметку со всех выбранных файлов"
  
  #: krusader.cpp:394
***************
*** 960,963 ****
--- 956,964 ----
  "archives."
  msgstr ""
+ "С момента ВАшего указания искать также и в архивах, помните слудующие ограничения:\n"
+ "1. Krusader будет искать во всех поддерживаемых архивах, НЕ ВКЛЮЧАЯ arj, "
+ "и ace.\n"
+ "2. Вы не можете искать текст, пока выполняется поиск, который включает "
+ "архивы."
  
  #: Search/krsearchdialog.cpp:463 Search/krsearchdialogbase.cpp:656
***************
*** 1111,1115 ****
  #: Search/krsearchdialogbase.cpp:608
  msgid "w"
! msgstr ""
  
  #: Search/krsearchdialogbase.cpp:552 Search/krsearchdialogbase.cpp:559
--- 1112,1116 ----
  #: Search/krsearchdialogbase.cpp:608
  msgid "w"
! msgstr "w"
  
  #: Search/krsearchdialogbase.cpp:552 Search/krsearchdialogbase.cpp:559
***************
*** 1119,1133 ****
  #: Search/krsearchdialogbase.cpp:623
  msgid "-"
! msgstr ""
  
  #: Search/krsearchdialogbase.cpp:558 Search/krsearchdialogbase.cpp:589
  #: Search/krsearchdialogbase.cpp:622
  msgid "r"
! msgstr ""
  
  #: Search/krsearchdialogbase.cpp:565 Search/krsearchdialogbase.cpp:596
  #: Search/krsearchdialogbase.cpp:615
  msgid "x"
! msgstr ""
  
  #: Search/krsearchdialogbase.cpp:573 Search/krsearchdialogbase.cpp:673
--- 1120,1134 ----
  #: Search/krsearchdialogbase.cpp:623
  msgid "-"
! msgstr "-"
  
  #: Search/krsearchdialogbase.cpp:558 Search/krsearchdialogbase.cpp:589
  #: Search/krsearchdialogbase.cpp:622
  msgid "r"
! msgstr "r"
  
  #: Search/krsearchdialogbase.cpp:565 Search/krsearchdialogbase.cpp:596
  #: Search/krsearchdialogbase.cpp:615
  msgid "x"
! msgstr "x"
  
  #: Search/krsearchdialogbase.cpp:573 Search/krsearchdialogbase.cpp:673
***************
*** 1146,1150 ****
  #: Konfigurator/kgadvanced.cpp:32
  msgid "Advanced"
! msgstr "Расширенный"
  
  #: Search/krsearchdialogbase.cpp:670
--- 1147,1151 ----
  #: Konfigurator/kgadvanced.cpp:32
  msgid "Advanced"
! msgstr "Дополнительные"
  
  #: Search/krsearchdialogbase.cpp:670
***************
*** 1212,1218 ****
  
  #: BookMan/bookmanguibase.cpp:407
- #, fuzzy
  msgid "If checked, bookmarks will be sorted, otherwise, custom ordering is enabled"
! msgstr "Если помечено, закладки будут отсортированны, иначе, обычный порядок будет включен"
  
  #: BookMan/bookmanguibase.cpp:408
--- 1213,1218 ----
  
  #: BookMan/bookmanguibase.cpp:407
  msgid "If checked, bookmarks will be sorted, otherwise, custom ordering is enabled"
! msgstr "Если помечено, закладки будут отсортированны, иначе, будет установлен обычный порядок"
  
  #: BookMan/bookmanguibase.cpp:408
***************
*** 1223,1226 ****
--- 1223,1230 ----
  "   arrows on the \"Edit Bookmarks\" tab."
  msgstr ""
+ "BookMan позволяет показывать закладки 2 способами:\n"
+ "1) Закладки сортируются по их ИМЕНАМ.\n"
+ "2) Неотсортировано: это позволяет указывать собственный порядок используя стрелки\n"
+ "    ВВЕРХ и ВНИЗ в таблице \"Редактирование закладок\"."
  
  #: BookMan/bookmanguibase.cpp:418
***************
*** 1296,1299 ****
--- 1300,1307 ----
  "creates unpredictable behaviour."
  msgstr ""
+ "Внимание: Вы пытаетесь монтировать 'самомонтирующуюся' файловую систему."
+ "Самомонтирующаяся файловая система (раз)монтируется Линуксом автоматически при"
+ "вставке/извлечении. Обычно это особенность дистрибутивов Линукс от Mandrake."
+ "Krusader не позволяет это сделать, так как результат этого действия непредсказуем."
  
  #: MountMan/kmountman.cpp:527
***************
*** 1312,1315 ****
--- 1320,1327 ----
  "creates unpredictable behaviour."
  msgstr ""
+ "Внимание: Вы пытаетесь размонтировать 'самомонтирующуюся' файловую систему."
+ "Самомонтирующаяся файловая система (раз)монтируется Линуксом автоматически при"
+ "вставке/извлечении. Обычно это особенность дистрибутивов Линукс от Mandrake."
+ "Krusader не позволяет это сделать, так как результат этого действия непредсказуем."
  
  #: MountMan/kmountman.cpp:563
***************
*** 1331,1335 ****
  #: MountMan/kmountman.cpp:595
  msgid "Error ejecting device ! You need to have 'eject' in your path."
! msgstr "Ошибка извлечения устройства ! Вы должны иметь 'eject' в вашем пути (path)."
  
  #: MountMan/kmountman.cpp:618
--- 1343,1347 ----
  #: MountMan/kmountman.cpp:595
  msgid "Error ejecting device ! You need to have 'eject' in your path."
! msgstr "Ошибка извлечения устройства ! Вы должны иметь 'eject' в вашей системе."
  
  #: MountMan/kmountman.cpp:618
***************
*** 1418,1422 ****
  
  #: _translatorinfo.cpp:1
- #, fuzzy
  msgid ""
  "_: NAME OF TRANSLATORS\n"
--- 1430,1433 ----
***************
*** 1425,1429 ****
  
  #: _translatorinfo.cpp:3
- #, fuzzy
  msgid ""
  "_: EMAIL OF TRANSLATORS\n"
--- 1436,1439 ----
***************
*** 1440,1446 ****
  
  #: Dialogs/krprogress.cpp:64 Dialogs/krprogress.cpp:239
- #, fuzzy
  msgid "Destination:"
! msgstr "Цель:"
  
  #: Dialogs/krprogress.cpp:112
--- 1450,1455 ----
  
  #: Dialogs/krprogress.cpp:64 Dialogs/krprogress.cpp:239
  msgid "Destination:"
! msgstr "Место назначения:"
  
  #: Dialogs/krprogress.cpp:112
***************
*** 1480,1487 ****
  #: Dialogs/krprogress.cpp:225
  msgid "Stalled"
! msgstr ""
  
  #: Dialogs/krprogress.cpp:228
- #, fuzzy
  msgid "%1/s ( %2 remaining )"
  msgstr "%1/s ( %2 запомнено )"
--- 1489,1495 ----
  #: Dialogs/krprogress.cpp:225
  msgid "Stalled"
! msgstr "Приостановлено"
  
  #: Dialogs/krprogress.cpp:228
  msgid "%1/s ( %2 remaining )"
  msgstr "%1/s ( %2 запомнено )"
***************
*** 1496,1502 ****
  
  #: Dialogs/krmaskchoice.cpp:84
- #, fuzzy
  msgid "Predefined Selections"
! msgstr "Предопределеные Selections"
  
  #: Dialogs/krmaskchoice.cpp:94
--- 1504,1509 ----
  
  #: Dialogs/krmaskchoice.cpp:84
  msgid "Predefined Selections"
! msgstr "Предопределенный выбор"
  
  #: Dialogs/krmaskchoice.cpp:94
***************
*** 1509,1516 ****
  "it down if needed."
  msgstr ""
  
  #: Dialogs/krmaskchoice.cpp:103
  msgid "Adds the selection in the line-edit to the list"
! msgstr ""
  
  #: Dialogs/krmaskchoice.cpp:108
--- 1516,1529 ----
  "it down if needed."
  msgstr ""
+ "Предопределенный выбор это файловая маска, которую Вы часто используете,\n"
+ "хорошим примером могут быть *.c, *.h, *.c *.o и т.д. Вы можете добавлять\n"
+ "эти маскив список написав их внизу и нажав кнопку 'Добавить'.\n"
+ "Клавиша 'Удалить' удаляет предопределенный выбор и 'Очистить' удаляет их все."
+ "Преджупреждаем, что строка в которой вы редактируете маску имеет свою "
+ "собственную историю, вы можете развернуть ее при необходимости."
  
  #: Dialogs/krmaskchoice.cpp:103
  msgid "Adds the selection in the line-edit to the list"
! msgstr "Добавить выбранное в строке редактирования к списку"
  
  #: Dialogs/krmaskchoice.cpp:108
***************
*** 1520,1524 ****
  #: Dialogs/krmaskchoice.cpp:113
  msgid "Clears the entire list of selections"
! msgstr "Очистить весь список отобраных"
  
  #: Dialogs/newftpgui.cpp:686
--- 1533,1537 ----
  #: Dialogs/krmaskchoice.cpp:113
  msgid "Clears the entire list of selections"
! msgstr "Очистить весь список выбранных"
  
  #: Dialogs/newftpgui.cpp:686
***************
*** 1564,1568 ****
  #: Dialogs/newftpgui.cpp:765
  msgid "About to connect to..."
! msgstr ""
  
  #: Dialogs/colormaskdialogbase.cpp:147
--- 1577,1581 ----
  #: Dialogs/newftpgui.cpp:765
  msgid "About to connect to..."
! msgstr "О соединении с..."
  
  #: Dialogs/colormaskdialogbase.cpp:147
***************
*** 1603,1607 ****
  
  #: Dialogs/krspecialwidgets.cpp:101
- #, fuzzy
  msgid "Supermount device."
  msgstr "Самомонтирующееся устройство."
--- 1616,1619 ----
***************
*** 1665,1669 ****
  #: Dialogs/krspwidgets.cpp:159
  msgid "Newer files (compare mode)"
! msgstr ""
  
  #: Dialogs/krspwidgets.cpp:160
--- 1677,1681 ----
  #: Dialogs/krspwidgets.cpp:159
  msgid "Newer files (compare mode)"
! msgstr "Более новые файлы (режим сравнения)"
  
  #: Dialogs/krspwidgets.cpp:160
***************
*** 1800,1810 ****
  
  #: Konfigurator/kggeneral.cpp:226
- #, fuzzy
  msgid "Use mimetype magic"
! msgstr "Использовать mimetype magic"
  
  #: Konfigurator/kggeneral.cpp:227
  msgid "Mimetype magic allows better distinction of file types, but is slower"
! msgstr "Mimetype magic позволяет лучше различать типы файлов, но это замедляет отображение"
  
  #: Konfigurator/kgwelcome.cpp:38
--- 1812,1821 ----
  
  #: Konfigurator/kggeneral.cpp:226
  msgid "Use mimetype magic"
! msgstr "Читать из файлов информацию об их типе ('mimetype magic')"
  
  #: Konfigurator/kggeneral.cpp:227
  msgid "Mimetype magic allows better distinction of file types, but is slower"
! msgstr "Чтетие записи 'mimetype magic' позволяет лучше различать типы файлов, но это замедляет работу"
  
  #: Konfigurator/kgwelcome.cpp:38
***************
*** 1838,1842 ****
  #: Konfigurator/konfigurator.cpp:82
  msgid "Startup"
! msgstr ""
  
  #: Konfigurator/konfigurator.cpp:83
--- 1849,1853 ----
  #: Konfigurator/konfigurator.cpp:82
  msgid "Startup"
! msgstr "Запуск"
  
  #: Konfigurator/konfigurator.cpp:83
***************
*** 1847,1851 ****
  #: Konfigurator/kglookfeel.cpp:115 Konfigurator/kglookfeel.cpp:130
  msgid "Look & Feel"
! msgstr ""
  
  #: Konfigurator/konfigurator.cpp:90
--- 1858,1862 ----
  #: Konfigurator/kglookfeel.cpp:115 Konfigurator/kglookfeel.cpp:130
  msgid "Look & Feel"
! msgstr "Внешний вид"
  
  #: Konfigurator/konfigurator.cpp:90
***************
*** 1859,1863 ****
  #: Konfigurator/konfigurator.cpp:97
  msgid "Costumize the way Krusader deals with archives"
! msgstr ""
  
  #: Konfigurator/kglookfeel.cpp:142
--- 1870,1874 ----
  #: Konfigurator/konfigurator.cpp:97
  msgid "Costumize the way Krusader deals with archives"
! msgstr "Настройка собственного способа работы Krusader с архивами"
  
  #: Konfigurator/kglookfeel.cpp:142
***************
*** 1910,1916 ****
  
  #: Konfigurator/kglookfeel.cpp:204
- #, fuzzy
  msgid "Minimize to tray"
! msgstr "Минимизировай в tray"
  
  #: Konfigurator/kglookfeel.cpp:209
--- 1921,1926 ----
  
  #: Konfigurator/kglookfeel.cpp:204
  msgid "Minimize to tray"
! msgstr "Минимизировай в 'трей'"
  
  #: Konfigurator/kglookfeel.cpp:209
***************
*** 1923,1927 ****
  
  #: Konfigurator/kglookfeel.cpp:249
- #, fuzzy
  msgid "Classic (both keys combined)"
  msgstr "Классический (комбинация обоих ключей)"
--- 1933,1936 ----
***************
*** 2129,2133 ****
  #: Konfigurator/kgarchives.cpp:97
  msgid "Krusader transparently handles the following types of archives:"
! msgstr ""
  
  #: Konfigurator/kgarchives.cpp:102
--- 2138,2142 ----
  #: Konfigurator/kgarchives.cpp:97
  msgid "Krusader transparently handles the following types of archives:"
! msgstr "Krusader обнаружил архиваторы для следующих типов архивов:"
  
  #: Konfigurator/kgarchives.cpp:102
***************
*** 2145,2148 ****
--- 2154,2160 ----
  "search again, click the 'Auto Configure' button."
  msgstr ""
+ "Архивы, которые выделены серым небыли доступны на Вашей \n"
+ "системе во время последней проверки Krusader'ом. Если Вы хотите, чтобы\n"
+ "Krusader повторил поиск снова, нажмите на кнопку 'Авто-конфигурация'."
  
  #: Konfigurator/kgarchives.cpp:132
***************
*** 2156,2167 ****
  "the files are stored in a temp directory inside /tmp."
  msgstr ""
  
  #: Konfigurator/kgarchives.cpp:137
  msgid "Test archive when finished packing                    "
! msgstr "Тестировать архив после упаковки"
  
  #: Konfigurator/kgarchives.cpp:138
  msgid "If checked, Krusader will test the archive's intergrity after packing it."
! msgstr ""
  
  #: Konfigurator/kgarchivesimpl.cpp:117
--- 2168,2182 ----
  "the files are stored in a temp directory inside /tmp."
  msgstr ""
+ "Это действие может быть сложным, системный отказ вовремя прохождения\n"
+ "процесса может привести к неправильному размещению файлов. Если это\n"
+ "случилось, файлы будут сохранены во временной директории /tmp."
  
  #: Konfigurator/kgarchives.cpp:137
  msgid "Test archive when finished packing                    "
! msgstr "Тестировать архив после завершения упаковки "
  
  #: Konfigurator/kgarchives.cpp:138
  msgid "If checked, Krusader will test the archive's intergrity after packing it."
! msgstr "Если отмечено, Krusader будет тестировать целостность архива после его создания."
  
  #: Konfigurator/kgarchivesimpl.cpp:117
***************
*** 2315,2319 ****
  msgstr ""
  "\n"
! "в вашу дорожку. (например: /usr/bin, /usr/local/bin ит.п.)"
  
  #: Konfigurator/kgarchivesimpl.cpp:142
--- 2330,2334 ----
  msgstr ""
  "\n"
! "в вашу директорию. (например: /usr/bin, /usr/local/bin ит.п.)"
  
  #: Konfigurator/kgarchivesimpl.cpp:142
***************
*** 2421,2425 ****
  msgstr ""
  "Krusader несмог найти любую поддреживаемую программу почтового клиента . "
! "Пожалуйста, установите ее в вашу дорожку. Hint: Krusader поддерживает kmail."
  
  #: krslots.cpp:119
--- 2436,2440 ----
  msgstr ""
  "Krusader несмог найти любую поддреживаемую программу почтового клиента . "
! "Пожалуйста, установите ее в вашу систему. Hint: Krusader поддерживает kmail."
  
  #: krslots.cpp:119
***************
*** 2436,2439 ****
--- 2451,2456 ----
  "to your path. Hint: Krusader supports kdiff and xxdiff."
  msgstr ""
+ "Krusader не нашел кокого-либо поддерживаемого diff-фронтенда. Установите его "
+ "в вашу систему. Hint: Krusader поддерживает kdiff and xxdiff."
  
  #: krslots.cpp:150
***************
*** 2446,2449 ****
--- 2463,2468 ----
  "select another one in the right panel."
  msgstr ""
+ "Для сравнения 2 файлов по содержимому, пометьие файл на левой панели, и "
+ "другой файл на правой панели."
  
  #: krslots.cpp:163 krslots.cpp:169
***************
*** 2457,2460 ****
--- 2476,2482 ----
  "do so!"
  msgstr ""
+ "Для сохранения времени необходимого для вхождения в архив, Krusader не"
+ "позволяет иметь закладки, которые указывают в архив, так как обычно "
+ "попытка создания такой закладки является ошибкой!"
  
  #: krslots.cpp:311
***************
*** 2467,2469 ****
--- 2489,2493 ----
  "You can get Krename at http://krename.sf.net"
  msgstr ""
+ "Не найден инструмент для переименования.\n"
+ "Вы можете получить Krename на http://krename.sf.net"
  

[Krusader-commits] krusader_kde3/krusader/Search krquery.cpp,1.2,1.3 krquery.h,1.1.1.1,1.2 krsearchdialog.cpp,1.10,1.11 krsearchdialogbase.cpp,1.3,1.4 krsearchdialogbase.h,1.2,1.3 krsearchmod.cpp,1.5,1.6

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv8730/krusader_kde3/krusader/Search

Modified Files:
	krquery.cpp krquery.h krsearchdialog.cpp 
	krsearchdialogbase.cpp krsearchdialogbase.h krsearchmod.cpp 
Log Message:

FIXED: text not found at the last line ++ ADDED: match whole word only


Index: krquery.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krquery.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krquery.cpp	18 Jul 2003 20:44:54 -0000	1.2
--- krquery.cpp	1 Oct 2003 13:17:50 -0000	1.3
***************
*** 38,41 ****
--- 38,42 ----
  KRQuery::KRQuery(): matches(""),matchesCaseSensitive(true),
                      contain(QString::null),containCaseSensetive(true),
+                     containWholeWord(false),
                      inArchive(false),recurse(true),followLinks(true),
                      minSize(0),maxSize(0),newerThen(0),olderThen(0),
***************
*** 69,72 ****
--- 70,74 ----
    krConfig->writeEntry("contain",contain);
    krConfig->writeEntry("containCaseSensetive",containCaseSensetive);
+   krConfig->writeEntry("containWholeWord",containWholeWord);
    krConfig->writeEntry("inArchive",inArchive);
    krConfig->writeEntry("recurse",recurse);
***************
*** 98,101 ****
--- 100,104 ----
    contain              = krConfig->readEntry("contain");
    containCaseSensetive = krConfig->readBoolEntry("containCaseSensetive",true);
+   containWholeWord     = krConfig->readBoolEntry("containWholeWord",false);
    inArchive            = krConfig->readBoolEntry("inArchive",false);
    recurse              = krConfig->readBoolEntry("recurse",true);

Index: krquery.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krquery.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** krquery.h	15 Apr 2002 18:51:04 -0000	1.1.1.1
--- krquery.h	1 Oct 2003 13:17:50 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
    QString contain;               // file must contain this string
    bool containCaseSensetive;
+   bool containWholeWord;
    bool inArchive;                // if true- search in archive.
    bool recurse;                  // if true recurse ob sub-dirs...

Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krsearchdialog.cpp	1 Oct 2003 11:41:08 -0000	1.10
--- krsearchdialog.cpp	1 Oct 2003 13:17:50 -0000	1.11
***************
*** 301,304 ****
--- 301,305 ----
      query->contain = containsText->currentText();
    query->containCaseSensetive = containsTextCase->isChecked();
+   query->containWholeWord     = containsWholeWord->isChecked();
    query->inArchive = searchInArchives->isChecked();
    query->recurse = searchInDirs->isChecked();

Index: krsearchdialogbase.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krsearchdialogbase.cpp	1 Oct 2003 11:41:08 -0000	1.3
--- krsearchdialogbase.cpp	1 Oct 2003 13:17:50 -0000	1.4
***************
*** 312,315 ****
--- 312,321 ----
      Layout7->addItem( spacer_2 );
  
+     containsWholeWord = new QCheckBox( GroupBox14, "containsWholeWord" );
+     containsWholeWord->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsWholeWord->sizePolicy().hasHeightForWidth() ) );
+     containsWholeWord->setText( i18n( "Match whole word only" ) );
+     containsWholeWord->setChecked( FALSE );
+     Layout7->addWidget( containsWholeWord );
+     
      containsTextCase = new QCheckBox( GroupBox14, "containsTextCase" );
      containsTextCase->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, containsTextCase->sizePolicy().hasHeightForWidth() ) );
***************
*** 317,321 ****
      containsTextCase->setChecked( TRUE );
      Layout7->addWidget( containsTextCase );
! 
      GroupBox14Layout->addLayout( Layout7, 1, 0 );
  
--- 323,327 ----
      containsTextCase->setChecked( TRUE );
      Layout7->addWidget( containsTextCase );
!     
      GroupBox14Layout->addLayout( Layout7, 1, 0 );
  

Index: krsearchdialogbase.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krsearchdialogbase.h	1 Oct 2003 11:41:08 -0000	1.2
--- krsearchdialogbase.h	1 Oct 2003 13:17:50 -0000	1.3
***************
*** 61,64 ****
--- 61,65 ----
      QGroupBox* GroupBox14;
      QCheckBox* containsTextCase;
+     QCheckBox* containsWholeWord;
      QLabel* TextLabel2;
      KHistoryCombo* containsText;

Index: krsearchmod.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchmod.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krsearchmod.cpp	20 Sep 2003 13:46:37 -0000	1.5
--- krsearchmod.cpp	1 Oct 2003 13:17:50 -0000	1.6
***************
*** 180,191 ****
        text.setEncoding(QTextStream::Locale);
        QString line;
  			while(!stopSearch && !text.atEnd() ){
          line = text.readLine();
          if (line.isNull() ) break;
!         if (line.find(query->contain, 0, query->containCaseSensetive) != -1)
!          	  break;
           	//qApp->processEvents(); // is that needed ?
        }
!       if (line.isNull() || text.atEnd() ) continue;
      }
  
--- 180,214 ----
        text.setEncoding(QTextStream::Locale);
        QString line;
+       bool found = false;
  			while(!stopSearch && !text.atEnd() ){
          line = text.readLine();
          if (line.isNull() ) break;
!         if ( query->containWholeWord )
!         {
!           int ndx = 0;
! 
!           while( ( ndx = line.find(query->contain, ndx, query->containCaseSensetive) ) != -1)
!           {
!             QChar before = line.at( ndx-1 );
!             QChar after  = line.at( ndx + query->contain.length() );
! 
!             if( !before.isLetterOrNumber() && !after.isLetterOrNumber() &&
!               after!='_' && before!='_')
!               {
!                 found = true;
!                 break;
!               }
!             //qApp->processEvents(); // is that needed ?
!             ndx++;
!           }
!         }
!         else if (line.find(query->contain, 0, query->containCaseSensetive) != -1)
!           found = true;
!         
!         if( found )
!           break;
           	//qApp->processEvents(); // is that needed ?
        }
!       if ( !found ) continue;
      }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.107,1.108

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv8730/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: text not found at the last line ++ ADDED: match whole word only


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** ChangeLog	1 Oct 2003 11:41:08 -0000	1.107
--- ChangeLog	1 Oct 2003 13:17:50 -0000	1.108
***************
*** 1,3 ****
--- 1,5 ----
  ======================
+     ADDED: KrSearch Match whole word only feature
+     FIXED: KrSearch does not find texts at the last row
      FIXED: Strange KrSearch GUI (SearchIn and DontSearchIn adding)
      FIXED: KrSearch crash at pressing Escape or Closing the window during search

[Krusader-commits] krusader_kde3/krusader/Search krsearchdialog.cpp,1.9,1.10 krsearchdialog.h,1.4,1.5 krsearchdialogbase.cpp,1.2,1.3 krsearchdialogbase.h,1.1.1.1,1.2

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv20040/krusader_kde3/krusader/Search

Modified Files:
	krsearchdialog.cpp krsearchdialog.h krsearchdialogbase.cpp 
	krsearchdialogbase.h 
Log Message:

FIXED: strange Search dialog GUI (SearchIn and DontSearchIn)


Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** krsearchdialog.cpp	30 Sep 2003 21:40:30 -0000	1.9
--- krsearchdialog.cpp	1 Oct 2003 11:41:08 -0000	1.10
***************
*** 249,254 ****
  
  void KrSearchDialog::addToSearchInManually() {
!   searchIn->append(searchInEdit->text());
!   searchInEdit->clear();
  }
  
--- 249,257 ----
  
  void KrSearchDialog::addToSearchInManually() {
!   if( searchInEdit->text().simplifyWhiteSpace().length() )
!   {  
!     searchIn->insertItem(searchInEdit->text());
!     searchInEdit->clear();
!   }
  }
  
***************
*** 261,266 ****
  
  void KrSearchDialog::addToDontSearchInManually() {
!   dontSearchIn->append(dontSearchInEdit->text());
!   dontSearchInEdit->clear();
  }
  
--- 264,272 ----
  
  void KrSearchDialog::addToDontSearchInManually() {
!   if( dontSearchInEdit->text().simplifyWhiteSpace().length() )
!   {
!     dontSearchIn->insertItem(dontSearchInEdit->text());
!     dontSearchInEdit->clear();
!   }
  }
  
***************
*** 302,309 ****
    else query->type = QString::null;
    // create the lists
!   query->whereToSearch = QStringList::split(QChar('\n'), searchIn->text().simplifyWhiteSpace());
    if (!searchInEdit->text().simplifyWhiteSpace().isEmpty())
      query->whereToSearch.append(searchInEdit->text().simplifyWhiteSpace());
!   query->whereNotToSearch = QStringList::split(QChar('\n'), dontSearchIn->text());
    if (!dontSearchInEdit->text().simplifyWhiteSpace().isEmpty())
      query->whereNotToSearch.append(dontSearchInEdit->text().simplifyWhiteSpace());
--- 308,329 ----
    else query->type = QString::null;
    // create the lists
!   query->whereToSearch.clear();
!   QListBoxItem *item = searchIn->firstItem();
!   while ( item )
!   {    
!     query->whereToSearch.append( item->text().simplifyWhiteSpace() );
!     item = item->next();
!   }
! 
    if (!searchInEdit->text().simplifyWhiteSpace().isEmpty())
      query->whereToSearch.append(searchInEdit->text().simplifyWhiteSpace());
! 
!   query->whereNotToSearch.clear();
!   item = dontSearchIn->firstItem();
!   while ( item )
!   {
!     query->whereNotToSearch.append( item->text().simplifyWhiteSpace() );
!     item = item->next();
!   }
    if (!dontSearchInEdit->text().simplifyWhiteSpace().isEmpty())
      query->whereNotToSearch.append(dontSearchInEdit->text().simplifyWhiteSpace());
***************
*** 545,548 ****
--- 565,584 ----
  }
  
+ void KrSearchDialog::deleteSelectedItems( QListBox *list_box )
+ {
+   int i=0;
+   QListBoxItem *item;
+ 
+   while( item = list_box->item(i) )
+   {
+     if( item->isSelected() )
+     {
+       list_box->removeItem( i );
+       continue;
+     }
+     i++;
+   }
+ }
+ 
  void KrSearchDialog::closeEvent(QCloseEvent *e)
  {                     /* if searching is in progress we must not close the window */
***************
*** 560,566 ****
  {
    if( isSearching && e->key() == Key_Escape ) /* at searching we must not close the window */
      stopSearch();         /* so we simply stop searching */
!   else
!     QDialog::keyPressEvent( e );
  }
  
--- 596,618 ----
  {
    if( isSearching && e->key() == Key_Escape ) /* at searching we must not close the window */
+   {
      stopSearch();         /* so we simply stop searching */
!     return;
!   }
!   else if( e->key() == Key_Delete )
!   {
!     if( searchIn->hasFocus() )
!     {
!       deleteSelectedItems( searchIn );
!       return;
!     }
!     if( dontSearchIn->hasFocus() )
!     {
!       deleteSelectedItems( dontSearchIn );
!       return;
!     }
!   }
! 
!   QDialog::keyPressEvent( e );
  }
  

Index: krsearchdialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krsearchdialog.h	30 Sep 2003 21:40:30 -0000	1.4
--- krsearchdialog.h	1 Oct 2003 11:41:08 -0000	1.5
***************
*** 81,84 ****
--- 81,85 ----
    bool gui2query();
    void query2gui();
+   void deleteSelectedItems( QListBox * );
  
  private:

Index: krsearchdialogbase.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krsearchdialogbase.cpp	5 Jul 2003 16:01:39 -0000	1.2
--- krsearchdialogbase.cpp	1 Oct 2003 11:41:08 -0000	1.3
***************
*** 32,37 ****
  #include <qimage.h>
  #include <qpixmap.h>
  
! static const char* const image0_data[] = { 
  "16 16 52 1",
  ". c None",
--- 32,38 ----
  #include <qimage.h>
  #include <qpixmap.h>
+ #include <qlistbox.h>
  
! static const char* const image0_data[] = {
  "16 16 52 1",
  ". c None",
***************
*** 140,143 ****
--- 141,179 ----
  ".##############."};
  
+ static const char * const image2_data[] = {
+ "16 16 17 1",
+ " 	c None",
+ ".	c #704A13",
+ "+	c #8A6E3C",
+ "@	c #997E52",
+ "#	c #2C1D06",
+ "$	c #EAD9B9",
+ "%	c #E0CBA7",
+ "&	c #C8A15E",
+ "*	c #DAB579",
+ "=	c #F8F5F0",
+ "-	c #BF9346",
+ ";	c #AB6503",
+ ">	c #C1892B",
+ ",	c #B6710C",
+ "'	c #965702",
+ ")	c #5A3202",
+ "!	c #0D0702",
+ "                ",
+ "     .+@@@+#    ",
+ "    +$$$%$$&#   ",
+ "   .$%**%**$&#  ",
+ "  .$*&*$=***%&# ",
+ " .%*&**==**&&%-#",
+ " .-&&&*$=%&&&-+#",
+ " #;>$$$==$$$*,.#",
+ " #;>========$,.#",
+ " #;,-&*$=*&-,,.#",
+ " #.;,,-%=&>,,')#",
+ " !)';,,%=>,,')# ",
+ "  !).;,&%>;;)#  ",
+ "   !).;;;;;)#   ",
+ "    !#).)))#    ",
+ "     ######     "};
  
  /* 
***************
*** 153,156 ****
--- 189,193 ----
      QPixmap image0( ( const char** ) image0_data );
      QPixmap image1( ( const char** ) image1_data );
+     QPixmap image2( ( const char** ) image2_data );
      if ( !name )
  	setName( "KrSearchBase" );
***************
*** 212,221 ****
      dontSearchInBtn->setPixmap( image0 );
  
!     GroupBox1_2Layout->addWidget( dontSearchInBtn, 0, 1 );
  
!     dontSearchIn = new QMultiLineEdit( GroupBox1_2, "dontSearchIn" );
!     dontSearchIn->setText( "" );
  
!     GroupBox1_2Layout->addMultiCellWidget( dontSearchIn, 1, 1, 0, 1 );
  
      tabLayout->addWidget( GroupBox1_2, 1, 1 );
--- 249,263 ----
      dontSearchInBtn->setPixmap( image0 );
  
!     dontSearchInBtnAdd = new QToolButton( GroupBox1_2, "dontSearchInBtnAdd" );
!     dontSearchInBtnAdd->setText( "" );
!     dontSearchInBtnAdd->setPixmap( image2 );    
!     
!     GroupBox1_2Layout->addWidget( dontSearchInBtn, 0, 2 );
!     GroupBox1_2Layout->addWidget( dontSearchInBtnAdd, 0, 1 );
  
!     dontSearchIn = new QListBox( GroupBox1_2, "dontSearchIn" );
!     dontSearchIn->setSelectionMode( QListBox::Extended );
  
!     GroupBox1_2Layout->addMultiCellWidget( dontSearchIn, 1, 1, 0, 2 );
  
      tabLayout->addWidget( GroupBox1_2, 1, 1 );
***************
*** 235,250 ****
      GroupBox1Layout->addWidget( searchInEdit, 0, 0 );
  
!     searchIn = new QMultiLineEdit( GroupBox1, "searchIn" );
!     searchIn->setText( "" );
  
!     GroupBox1Layout->addMultiCellWidget( searchIn, 1, 1, 0, 1 );
  
      searchInBtn = new QToolButton( GroupBox1, "searchInBtn" );
      searchInBtn->setText( "" );
      searchInBtn->setPixmap( image0 );
  
!     GroupBox1Layout->addWidget( searchInBtn, 0, 1 );
  
-     tabLayout->addWidget( GroupBox1, 1, 0 );
  
      GroupBox14 = new QGroupBox( tab, "GroupBox14" );
--- 277,298 ----
      GroupBox1Layout->addWidget( searchInEdit, 0, 0 );
  
!     searchIn = new QListBox( GroupBox1, "searchIn" );
!     searchIn->setSelectionMode( QListBox::Extended );
!   
!     GroupBox1Layout->addMultiCellWidget( searchIn, 1, 1, 0, 2 );
  
!     searchInBtnAdd = new QToolButton( GroupBox1, "searchInBtnAdd" );
!     searchInBtnAdd->setText( "" );
!     searchInBtnAdd->setPixmap( image2 );
  
+     GroupBox1Layout->addWidget( searchInBtnAdd, 0, 1 );
+ 
+     tabLayout->addWidget( GroupBox1, 1, 0 );
      searchInBtn = new QToolButton( GroupBox1, "searchInBtn" );
      searchInBtn->setText( "" );
      searchInBtn->setPixmap( image0 );
  
!     GroupBox1Layout->addWidget( searchInBtn, 0, 2 );
  
  
      GroupBox14 = new QGroupBox( tab, "GroupBox14" );
***************
*** 682,686 ****
--- 730,736 ----
      connect( mainStopBtn, SIGNAL( clicked() ), this, SLOT( stopSearch() ) );
      connect( searchInBtn, SIGNAL( clicked() ), this, SLOT( addToSearchIn() ) );
+     connect( searchInBtnAdd, SIGNAL( clicked() ), this, SLOT( addToSearchInManually() ) );
      connect( dontSearchInBtn, SIGNAL( clicked() ), this, SLOT( addToDontSearchIn() ) );
+     connect( dontSearchInBtnAdd, SIGNAL( clicked() ), this, SLOT( addToDontSearchInManually() ) );
      connect( searchInEdit, SIGNAL( returnPressed(const QString&) ), this, SLOT( addToSearchInManually() ) );
      connect( dontSearchInEdit, SIGNAL( returnPressed(const QString&) ), this, SLOT( addToDontSearchInManually() ) );

Index: krsearchdialogbase.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialogbase.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** krsearchdialogbase.h	15 Apr 2002 18:51:20 -0000	1.1.1.1
--- krsearchdialogbase.h	1 Oct 2003 11:41:08 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  #include <qvariant.h>
  #include <qdialog.h>
+ 
  class QVBoxLayout; 
  class QHBoxLayout; 
***************
*** 27,30 ****
--- 28,32 ----
  class QListViewItem;
  class QMultiLineEdit;
+ class QListBox;
  class QPushButton;
  class QRadioButton;
***************
*** 50,58 ****
      KLineEdit* dontSearchInEdit;
      QToolButton* dontSearchInBtn;
!     QMultiLineEdit* dontSearchIn;
      QGroupBox* GroupBox1;
      KLineEdit* searchInEdit;
!     QMultiLineEdit* searchIn;
      QToolButton* searchInBtn;
      QGroupBox* GroupBox14;
      QCheckBox* containsTextCase;
--- 52,62 ----
      KLineEdit* dontSearchInEdit;
      QToolButton* dontSearchInBtn;
!     QToolButton* dontSearchInBtnAdd;
!     QListBox* dontSearchIn;
      QGroupBox* GroupBox1;
      KLineEdit* searchInEdit;
!     QListBox* searchIn;
      QToolButton* searchInBtn;
+     QToolButton* searchInBtnAdd;
      QGroupBox* GroupBox14;
      QCheckBox* containsTextCase;

[Krusader-commits] krusader_kde3 ChangeLog,1.106,1.107

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv20040/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: strange Search dialog GUI (SearchIn and DontSearchIn)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** ChangeLog	30 Sep 2003 21:40:29 -0000	1.106
--- ChangeLog	1 Oct 2003 11:41:08 -0000	1.107
***************
*** 1,3 ****
--- 1,4 ----
  ======================
+     FIXED: Strange KrSearch GUI (SearchIn and DontSearchIn adding)
      FIXED: KrSearch crash at pressing Escape or Closing the window during search
      ADDED: Tab-browsing shortens tabs when more tabs are created

[Krusader-commits] krusader_kde3/krusader/Search krsearchdialog.cpp,1.8,1.9 krsearchdialog.h,1.3,1.4

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Search
In directory sc8-pr-cvs1:/tmp/cvs-serv6487/krusader_kde3/krusader/Search

Modified Files:
	krsearchdialog.cpp krsearchdialog.h 
Log Message:

FIXED: KrSearch crash at pressing Escape or closing the widget during search


Index: krsearchdialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krsearchdialog.cpp	20 Sep 2003 10:18:09 -0000	1.8
--- krsearchdialog.cpp	30 Sep 2003 21:40:30 -0000	1.9
***************
*** 108,111 ****
--- 108,113 ----
    searchFor->setFocus();
  	resultsList->setColumnAlignment(2, AlignRight);
+ 
+   isSearching = closed = false;
  }
  
***************
*** 480,484 ****
--- 482,490 ----
    connect(searcher, SIGNAL(finished()), this, SLOT(stopSearch()));
  
+   isSearching = true;
    searcher->start();
+   isSearching = false;
+   if( closed )
+     emit closeDialog();
  }
  
***************
*** 538,541 ****
--- 544,568 ----
  void KrSearchDialog::loadSearch(QListViewItem *) {
  }
+ 
+ void KrSearchDialog::closeEvent(QCloseEvent *e)
+ {                     /* if searching is in progress we must not close the window */
+   if( isSearching )   /* because qApp->processEvents() is called by the searcher and */
+   {                   /* at window desruction, the searcher object will be deleted */
+     stopSearch();         /* instead we stop searching */
+     closed = true;        /* and after stopping: startSearch can close the window */
+     e->ignore();          /* ignoring the close event */
+   }
+   else
+     QDialog::closeEvent( e );   /* if no searching, let QDialog handle the event */
+ }
+ 
+ void KrSearchDialog::keyPressEvent(QKeyEvent *e)
+ {
+   if( isSearching && e->key() == Key_Escape ) /* at searching we must not close the window */
+     stopSearch();         /* so we simply stop searching */
+   else
+     QDialog::keyPressEvent( e );
+ }
+ 
  
  #include "krsearchdialog.moc"

Index: krsearchdialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Search/krsearchdialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krsearchdialog.h	20 Sep 2003 10:17:30 -0000	1.3
--- krsearchdialog.h	30 Sep 2003 21:40:30 -0000	1.4
***************
*** 69,72 ****
--- 69,75 ----
    void resultClicked(QListViewItem*);
  
+   virtual void keyPressEvent(QKeyEvent *e);
+   virtual void closeEvent(QCloseEvent *e);
+ 
  protected slots:
    void reject();
***************
*** 84,87 ****
--- 87,92 ----
    KShellCompletion completion;
    QStringList savedSearches;
+   bool isSearching;
+   bool closed;
  };
  

[Krusader-commits] krusader_kde3 ChangeLog,1.105,1.106

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv6487/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: KrSearch crash at pressing Escape or closing the widget during search


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ChangeLog	29 Sep 2003 21:49:03 -0000	1.105
--- ChangeLog	30 Sep 2003 21:40:29 -0000	1.106
***************
*** 1,5 ****
  ======================
      ADDED: Tab-browsing shortens tabs when more tabs are created
!     FIXED: 
      FIXED: cmdline would start-up focused on the wrong panel
      FIXED: when pressing ctrl-enter (or ctrl-shift-enter), focus goes to command line
--- 1,6 ----
  ======================
+     FIXED: KrSearch crash at pressing Escape or Closing the window during search
      ADDED: Tab-browsing shortens tabs when more tabs are created
!     FIXED:
      FIXED: cmdline would start-up focused on the wrong panel
      FIXED: when pressing ctrl-enter (or ctrl-shift-enter), focus goes to command line

[Krusader-commits] krusader_kde3/krusader krusaderui.rc,1.12,1.13

[<ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv31296/krusader_kde3/krusader

Modified Files:
	krusaderui.rc 
Log Message:

ADDED: root mode krusader menuitem


Index: krusaderui.rc
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderui.rc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** krusaderui.rc	26 Sep 2003 22:36:00 -0000	1.12
--- krusaderui.rc	30 Sep 2003 11:19:42 -0000	1.13
***************
*** 32,35 ****
--- 32,37 ----
     <Action name="terminal@home" />
     <Separator/>
+    <Action name="root krusader" />
+    <Separator/>
     <Action name="ftp connect" />
     <Action name="ftp new connection" />

[Krusader-commits] krusader_kde3/krusader panelmanager.cpp,1.2,1.3

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv26440/krusader

Modified Files:
	panelmanager.cpp 
Log Message:
  _barLayout = new QHBoxLayout(_layout); 
 

Index: panelmanager.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** panelmanager.cpp	22 Sep 2003 19:36:22 -0000	1.2
--- panelmanager.cpp	29 Sep 2003 21:54:08 -0000	1.3
***************
*** 9,12 ****
--- 9,16 ----
  #include "krusaderview.h"
  
+ #define HIDE_ON_SINGLE_TAB  false
+ 
+ #define SHOW  { _newTab->show(); _tabbar->show(); _closeTab->show(); }
+ #define HIDE  { _newTab->hide(); _tabbar->hide(); _closeTab->hide(); }
  
  PanelManager::PanelManager( QWidget *parent, bool left, ListPanel* &self, ListPanel* &other, ListPanel* &active ) :
***************
*** 18,22 ****
    _newTab = new QToolButton( this );
    _newTab->setFixedSize( 22, 22 );
!   _newTab->setTextLabel( i18n( "Open a new tab in -home-" ) );
    QImage im = krLoader->loadIcon( "favorites", KIcon::Panel ).convertToImage();
    _newTab->setPixmap( im.scale( _newTab->height() - 5, _newTab->height() - 5 ) );
--- 22,26 ----
    _newTab = new QToolButton( this );
    _newTab->setFixedSize( 22, 22 );
!   _newTab->setTextLabel( i18n( "Open a new tab in home" ) );
    QImage im = krLoader->loadIcon( "favorites", KIcon::Panel ).convertToImage();
    _newTab->setPixmap( im.scale( _newTab->height() - 5, _newTab->height() - 5 ) );
***************
*** 42,45 ****
--- 46,52 ----
    _layout->addWidget( _tabbar, 1, 1 );
    _layout->addWidget( _closeTab, 1, 2 );
+ 
+   if (HIDE_ON_SINGLE_TAB) HIDE
+   else SHOW
  }
  
***************
*** 63,68 ****
  
    // allow close button if more than 1 tab
!   if ( _tabbar->count() > 1 )
      _closeTab->setEnabled( true );
    _stack->raiseWidget( p );
  
--- 70,77 ----
  
    // allow close button if more than 1 tab
!   if ( _tabbar->count() > 1 ) {
      _closeTab->setEnabled( true );
+     SHOW // needed if we were hidden
+   }
    _stack->raiseWidget( p );
  
***************
*** 101,106 ****
  
    // disable close button if only 1 tab is left
!   if ( _tabbar->count() == 1 )
      _closeTab->setEnabled( false );
  }
  
--- 110,117 ----
  
    // disable close button if only 1 tab is left
!   if ( _tabbar->count() == 1 ) {
      _closeTab->setEnabled( false );
+     if (HIDE_ON_SINGLE_TAB) HIDE
+   }
  }
  

[Krusader-commits] krusader_kde3/krusader panelmanager.h,1.3,1.4

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/krusader

Modified Files:
	panelmanager.h 
Log Message:
 

Index: panelmanager.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** panelmanager.h	28 Sep 2003 18:23:13 -0000	1.3
--- panelmanager.h	29 Sep 2003 21:52:18 -0000	1.4
***************
*** 48,51 ****
--- 48,52 ----
    private:
      QGridLayout *_layout;
+     QHBoxLayout *_barLayout;
      bool _left;
      PanelTabBar *_tabbar;

[Krusader-commits] krusader_kde3/krusader paneltabbar.h,1.3,1.4

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv26055/krusader

Modified Files:
	paneltabbar.h 
Log Message:
 

Index: paneltabbar.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** paneltabbar.h	22 Sep 2003 20:50:22 -0000	1.3
--- paneltabbar.h	29 Sep 2003 21:52:01 -0000	1.4
***************
*** 37,42 ****
  };
  
- #define HIDE_ON_SINGLE_TAB false
- 
  /**
   * This class extends QTabBar such that right-clicking on a tab pops-up a menu
--- 37,40 ----
***************
*** 93,96 ****
--- 91,95 ----
    bool _left;
    KAction *_closeAction, *_newTabSame, *_newTabRoot;
+   int _maxTabLength;
  };
  

[Krusader-commits] krusader_kde3/krusader paneltabbar.cpp,1.3,1.4

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv26013/krusader

Modified Files:
	paneltabbar.cpp 
Log Message:
 

Index: paneltabbar.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/paneltabbar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** paneltabbar.cpp	22 Sep 2003 20:50:46 -0000	1.3
--- paneltabbar.cpp	29 Sep 2003 21:51:47 -0000	1.4
***************
*** 27,32 ****
  #include <qfontmetrics.h>
  #include <qtooltip.h>
  
! PanelTabBar::PanelTabBar(QWidget *parent): QTabBar(parent) {
    _panelActionMenu = new KActionMenu( i18n("Panel"), this );
  
--- 27,33 ----
  #include <qfontmetrics.h>
  #include <qtooltip.h>
+ #include <kdebug.h>
  
! PanelTabBar::PanelTabBar(QWidget *parent): QTabBar(parent), _maxTabLength(0) {
    _panelActionMenu = new KActionMenu( i18n("Panel"), this );
  
***************
*** 41,46 ****
  
    setShape(QTabBar::TriangularBelow);
- 
-   if (HIDE_ON_SINGLE_TAB) hide();
  }
  
--- 42,45 ----
***************
*** 74,79 ****
  
  int PanelTabBar::addPanel(ListPanel *panel) {
!   int newId = addTab(new PanelTab(panel->virtualPath, panel));
  
    layoutTabs();
    setCurrentTab(newId);
--- 73,81 ----
  
  int PanelTabBar::addPanel(ListPanel *panel) {
!   int newId = addTab(new PanelTab(squeeze(panel->virtualPath), panel));
  
+   // make sure all tabs lengths are correct
+   for (int i=0; i<count(); i++)
+     tabAt(i)->setText(squeeze(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath));
    layoutTabs();
    setCurrentTab(newId);
***************
*** 82,86 ****
    if (count()>1) {
      _closeAction->setEnabled(true);
-     show(); // todo-do we need this?
    }
  
--- 84,87 ----
***************
*** 96,99 ****
--- 97,103 ----
    disconnect(dynamic_cast<PanelTab*>(tab(id))->panel);
    removeTab(tab(id));
+ 
+   for (int i=0; i<count(); i++)
+     tabAt(i)->setText(squeeze(dynamic_cast<PanelTab*>(tabAt(i))->panel->virtualPath));
    layoutTabs();
  
***************
*** 114,118 ****
    for (int i=0; i<count(); i++) {
      if (dynamic_cast<PanelTab*>(tabAt(i))->panel == panel) {
!       tabAt(i)->setText(panel->virtualPath);
        break;
      }
--- 118,122 ----
    for (int i=0; i<count(); i++) {
      if (dynamic_cast<PanelTab*>(tabAt(i))->panel == panel) {
!       tabAt(i)->setText(squeeze(panel->virtualPath));
        break;
      }
***************
*** 131,135 ****
  QString PanelTabBar::squeeze(QString text) {
    QFontMetrics fm(fontMetrics());
!   int labelWidth = (tabAt(0) ? tab(0)->rect().width() : fm.width("WWWWW"));
    int textWidth = fm.width(text);
    if (textWidth > labelWidth) {
--- 135,145 ----
  QString PanelTabBar::squeeze(QString text) {
    QFontMetrics fm(fontMetrics());
! 
!   // set the real max length
!   _maxTabLength = (static_cast<QWidget*>(parent())->width()-(6*fm.width("W")))/fm.width("W");
!   // each tab gets a fair share of the max tab length
!   int _effectiveTabLength = _maxTabLength / (count() == 0 ? 1 : count());
! 
!   int labelWidth = fm.width("W")*_effectiveTabLength;
    int textWidth = fm.width(text);
    if (textWidth > labelWidth) {
***************
*** 166,170 ****
      if (letters < 5) {
      	// too few letters added -> we give up squeezing
!     	return text;
      } else {
  	    return squeezedText;
--- 176,181 ----
      if (letters < 5) {
      	// too few letters added -> we give up squeezing
!       //return text;
!     	return squeezedText;
      } else {
  	    return squeezedText;

[Krusader-commits] krusader_kde3 ChangeLog,1.104,1.105

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv25418

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** ChangeLog	29 Sep 2003 18:58:29 -0000	1.104
--- ChangeLog	29 Sep 2003 21:49:03 -0000	1.105
***************
*** 1,3 ****
--- 1,5 ----
  ======================
+     ADDED: Tab-browsing shortens tabs when more tabs are created
+     FIXED: 
      FIXED: cmdline would start-up focused on the wrong panel
      FIXED: when pressing ctrl-enter (or ctrl-shift-enter), focus goes to command line

[Krusader-commits] krusader_kde3/krArc krarc.cpp,1.7,1.8

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krArc
In directory sc8-pr-cvs1:/tmp/cvs-serv19579/krArc

Modified Files:
	krarc.cpp 
Log Message:
Fixed unpack bug with rar archives

Index: krarc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** krarc.cpp	20 Sep 2003 13:46:37 -0000	1.7
--- krarc.cpp	29 Sep 2003 19:37:52 -0000	1.8
***************
*** 646,650 ****
      cmd = "unrar" ;
      listCmd = "unrar -c- v ";
!     getCmd  = "unrar x -y ";
      delCmd  = "rar d ";
      putCmd  = "rar -r a ";
--- 646,650 ----
      cmd = "unrar" ;
      listCmd = "unrar -c- v ";
!     getCmd  = "unrar p -y ";
      delCmd  = "rar d ";
      putCmd  = "rar -r a ";

[Krusader-commits] krusader_kde3/krusader/GUI kcmdline.cpp,1.15,1.16

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv19135/krusader/GUI

Modified Files:
	kcmdline.cpp 
Log Message:
The run-in-terminal option now allows pipes and pause for 1 hour before closing

Index: kcmdline.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kcmdline.cpp	29 Sep 2003 17:44:18 -0000	1.15
--- kcmdline.cpp	29 Sep 2003 19:36:19 -0000	1.16
***************
*** 80,84 ****
    cmdLine->setHistoryItems( list );
  
-   connect( cmdLine, SIGNAL( activated( const QString& ) ), this, SLOT( setEditText( const QString& ) ) );
    connect( cmdLine, SIGNAL( returnPressed(const QString& ) ), this, SLOT( slotRun( const QString& ) ) );
    connect( cmdLine, SIGNAL( returnPressed(const QString &) ), cmdLine, SLOT( clearEdit() ) );
--- 80,83 ----
***************
*** 148,155 ****
      chdir( panelPath.local8Bit() );
      // run in a terminal ???
!     if ( terminal->isOn() )
!       proc << krConfig->readEntry( "Terminal", _Terminal )
!       << "--noclose -e";
!     proc << command1;
      proc.start( KProcess::DontCare );
  
--- 147,175 ----
      chdir( panelPath.local8Bit() );
      // run in a terminal ???
!     if ( terminal->isOn() ) {
!       QString terminal = krConfig->readEntry( "Terminal", _Terminal );
!       proc << terminal;
!       // if the terminal support is - don't close when the command finish
!       //if( terminal == "konsole" ) proc << "--noclose ";
!       //if( terminal == "xterm" ) proc << "-hold ";
!       //if( terminal == "Eterm" ) proc << "--pause ";
!       proc << "-e ";
!       // redirect the command to file so pipe will be supperted..
!       KTempFile tmpfile("krcmd","tmp");
!       QTextStream *stream = tmpfile.textStream();
!       // delete the temporary file
!       *stream << "rm -rf " << tmpfile.name() << endl;
!       *stream << command1 << endl;
!       *stream << "echo" << endl;
!       *stream << "echo Krusader: "+i18n("This terminal will close in 1 hour..") << endl;
!       *stream << "sleep 3600" << endl;
!       
!       // execute file with favorite shell
!       proc << getenv("SHELL") << tmpfile.name(); 
!       
!     }
!     else {
!       proc << command1;
!     }
      proc.start( KProcess::DontCare );
  

[Krusader-commits] krusader_kde3/doc krusader.1,NONE,1.1 Makefile.am,1.3,1.4

[<ma...@us...>]

Update of /cvsroot/krusader/krusader_kde3/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv18622/doc

Modified Files:
	Makefile.am 
Added Files:
	krusader.1 
Log Message:
add: manpage

--- NEW FILE: krusader.1 ---
.TH krusader 1 "25 September 2003" Linux "Krusader Manpage"
.SH "NAME"
krusader \- twin-panel file manager and ftp client for KDE 3.x
.SH "USAGE"
.B krusader [Qt-options] [KDE-options] [options]
.SH "DESCRIPTION"
Krusader is a new "old-school" file manager and ftp/smb/fish client.
It's twin-panel look follows in the footsteps of the great file managers
of old: GNU's Midnight Commander and the DOS all time favorite Norton Commander.

Krusader features:

intuitive GUI, complete drag n' drop support, transparent handling of archives
and ftp volumes, bookmarks (with a bookmark manager), pack and unpack,
command line with history and "run in terminal" option, internal viewer-editor,
built-in mount manager with an auto-mount option and much more.

.SH "OPTIONS"
.TP
.B --left <\fIpath\fR>
start left panel at <path>
.TP
.B --right <\fIpath\fR>
start right panel at <path>
.TP
.B --help
show the general options
.TP
.B --help-all
show the all the options
.TP
.B --author
show the authors
.TP
.B -v, --version
show the version
.TP
.B --license
show the license
.SH "[Qt-options]"
"$ krusader --help-qt"  shows the all the Qt-options
.SH "[KDE-options]"
"$ krusader --help-kde" shows the all the KDE-options
.SH "EXAMPLE"
.B $ krusader --left=/mnt/cdrom --right=ftp://dow...@my...
.SH "FILES"
The configuration file "krusaderrc" can be stored at 2 locations:

.I $KDEDIR/share/config/krusaderrc

or

.I ~/.kde/share/config/krusaderrc
.SH "PLATFORMS"
Linux, FreeBSD

.I KDE 2.x

krusader v1.01   stable but there are no planned changes.

.I KDE 3.x

The latest version of Krusader can be found at the Krusader website.

Note: all versions >=1.02 are KDE3.x only
.SH "FEATURES"

Configurable toolbar and key-bindings.

Full Ace, Arj, Bzip2, Gzip, Tar, Rpm, Rar, Zip support.

Advanced search module that can search in archives.

Directory comparison and filtering.

Ftp/Samba/Fish connections.

Opens a terminal to the browsed path.

Optional embedded console.

Bookmark module that takes local files and remote ones.

Shows the effective permissions for the current user.

Calculates occupied space by marked files and folders.

Internal viewer and configurable Editor.

Offers a command line capable of running something in a terminal with a single click of a button.

Packs (or unpacks) files into a single archive of your choice, without typing a single command.

Tests the integrity of archives.

Compare files by content (via external diff program such as KDiff)

Fully mimetype-aware (with or without magic!).

Mountmanager
.SH "LICENSE"
Krusader is distributed under the terms of the GNU General Public

License version 2 as published by the Free Software Foundation. See the built-in

help for details on the License and the lack of warranty.

The copyright for the project and its name are still held by Shie Erlich and Rafi Yanai.
.SH "i18n"
Krusader supports the at this moment following languages:

.I English, Czech, Danish, Dutch, French, German, Hungarian, Italian,

.I Japanese, Polish, Russian, Slovak, Spanish, Swedish.

Read the Krusader translation howto if you want translate Krusader in your native language.
.SH "FAQ'S"
The latest version of the KRUSADER FAQ'S can be found at the Krusader website.
.SH "SEE ALSO"
The Krusader USERS MANUAL, at the krusader help menu.

The Krusader homepage on the World Wide Web:

http://krusader.sourceforge.net
.fi
.SH "AUTHORS"

Krusader is developed by a dedicated team of individuals, known as the Krusader Krew.

Shie Erlich, author <ma...@us...>

Rafi Yanai, author <ya...@us...>

Dirk Eschler, Webmaster and i18n coordinator <des...@us...>

Jan Halasa, Developer <jan...@us...>

Csaba Karai, Developer <csa...@no...>

The project is written using KDevelop and QT Designer.

Author of the Krusader Manpage <fra...@ya...>
.SH "BUGS"
See the file TODO in the distribution for information on what remains to be done.

.B Notice: if you've got bugs to report, please use the krusader website, and

.B not KDE's bugzilla (bugs.kde.org).

For fixes, patches and comments use the krusader forum or mail to

<kru...@us...>.

Krusader Krew


Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	12 Jun 2003 22:41:35 -0000	1.3
--- Makefile.am	29 Sep 2003 19:34:44 -0000	1.4
***************
*** 3,6 ****
--- 3,15 ----
  SUBDIRS = en pics 
  
+ EXTRA_DIST = krusader.1 
+ 
+ install-data-local:
+ 	$(mkinstalldirs) /usr/share/man/man1/
+ 	$(INSTALL_DATA) $(srcdir)/krusader.1 /usr/share/man/man1/krusader.1
+ 
+ uninstall-local:
+ 	-rm -f /usr/share/man/man1/krusader.1
+ 
  ####### kdevelop will overwrite this part!!! (end)############