Merge from BRANCH_1_0

6 files changed, 66 insertions, 66 deletions

diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 38ba55d..22a4917 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -112,25 +112,25 @@ KWBuffer::slotLoadFile()
 {
   loadFilePart();
 //  emit linesChanged(m_totalLines);
   emit linesChanged(20);
 }
 
 /**
  * Return the total number of lines in the buffer.
  */
 int
 KWBuffer::count()
 {
-//  qDebug("m_stringList.count %d",m_stringList.count());
+  qDebug("m_stringList.count %d",m_stringList.count());
   return m_lineCount;
 //	return m_stringList.count();
 //   return m_totalLines;
 }
 
 
 void KWBuffer::seek(int i)
 {
    if (m_stringListCurrent == i)
       return;
    while(m_stringListCurrent < i)
    {
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 844f27d..f90a5f8 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -62,25 +62,25 @@ void SyntaxDocument::setupModeList(bool force)
 
   for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
   {
     QString Group="Highlighting_Cache"+path+*it;
     if ((config->hasGroup(Group)) && (!force))
     {
       config->setGroup(Group);
       syntaxModeListItem *mli=new syntaxModeListItem;
       mli->name = config->readEntry("name","");
       mli->section = config->readEntry("section","");
       mli->mimetype = config->readEntry("mimetype","");
       mli->extension = config->readEntry("extension","");
-      mli->identifier = *it;
+      mli->identifier = path+*it;
       myModeList.append(mli);
     }
     else
     {
 	qDebug("Found a description file:"+path+(*it));
         setIdentifier(path+(*it));
         Opie::XMLElement *e=m_root;
         if (e)
         {
 	  e=e->firstChild();
 	  qDebug(e->tagName());
           if (e->tagName()=="language")
@@ -96,24 +96,25 @@ void SyntaxDocument::setupModeList(bool force)
 
             mli->identifier = path+(*it);
             config->setGroup(Group);
             config->writeEntry("name",mli->name);
             config->writeEntry("section",mli->section);
             config->writeEntry("mimetype",mli->mimetype);
             config->writeEntry("extension",mli->extension);
             myModeList.append(mli);
           }
         }
     }
   }
+  config->write();
 //  config->sync();
 }
 
 SyntaxModeList SyntaxDocument::modeList()
 {
   return myModeList;
 }
 
 bool SyntaxDocument::nextGroup( syntaxContextData* data)
 {
   if(!data) return false;
 
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 5cb0b14..b282059 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -1,86 +1,91 @@
-TEMPLATE  = lib
-CONFIG    = qt warn_on release
-HEADERS   = microkde/kapplication.h \
-      kateconfig.h \
+TEMPLATE	= lib
+CONFIG		= qt warn_on release
+HEADERS		= microkde/kapplication.h \
+		  kateconfig.h \
                   microkde/kdebug.h \
                   microkde/kdialog.h \
                   microkde/kdialogbase.h \
                   microkde/kfiledialog.h \
                   microkde/kglobal.h \
                   microkde/kiconloader.h \
                   microkde/klineedit.h \
                   microkde/klocale.h \
                   microkde/kmessagebox.h \
                   microkde/kprinter.h \
                   microkde/krestrictedline.h \
                   microkde/kseparator.h \
                   microkde/kstandarddirs.h \
                   microkde/ktempfile.h \
                   microkde/kunload.h \
                   microkde/kurlrequester.h \
                   microkde/kfontdialog.h \
                   microkde/krun.h \
                   microkde/knumvalidator.h \
                   microkde/kstaticdeleter.h \
                   microkde/klistview.h \
                   microkde/kglobalsettings.h \
-      microkde/kcolorbtn.h \
-      qt3back/qregexp3.h \
-      microkde/ksharedptr.h \
-      document/katebuffer.h  document/katedialogs.h \
-      document/katetextline.h \
-      document/katecmd.h \
-      document/katehighlight.h \
-      document/katecmds.h    document/katedocument.h  \
-      document/katesyntaxdocument.h \
-      view/kateundohistory.h  \
-      view/kateview.h  \
-      view/kateviewdialog.h \
-      interfaces/view.h \
-      interfaces/document.h \
-      ktexteditor/ktexteditor.h
+		  microkde/kcolorbtn.h \
+		  \
+	          \
+		  qt3back/qregexp3.h \
+		  microkde/ksharedptr.h \
+		  document/katebuffer.h  document/katedialogs.h \
+		  document/katetextline.h \
+		  document/katecmd.h \
+		  document/katehighlight.h \
+		  document/katecmds.h    document/katedocument.h  \
+		  document/katesyntaxdocument.h \
+		  view/kateundohistory.h  \
+		  view/kateview.h  \
+		  view/kateviewdialog.h \
+		  interfaces/view.h \
+		  interfaces/document.h \
+		  ktexteditor/ktexteditor.h
 
-SOURCES   = microkde/kapplication.cpp \
+SOURCES		= microkde/kapplication.cpp \
                   microkde/kdialogbase.cpp \
-      kateconfig.cpp \
+		  kateconfig.cpp \
                   microkde/klocale.cpp \
                   microkde/kmessagebox.cpp \
                   microkde/kprocess.cpp \
                   microkde/kstandarddirs.cpp \
                   microkde/ktempfile.cpp \
                   microkde/kurlrequester.cpp \
+                  microkde/kcolordialog.cpp \
                   microkde/kfontdialog.cpp \
                   microkde/krun.cpp \
                   microkde/knumvalidator.cpp \
                   microkde/kglobal.cpp \
                   microkde/kglobalsettings.cpp \
-      microkde/kcolorbtn.cpp \
-      qt3back/qregexp3.cpp \
-      ktexteditor/ktexteditor.cpp \
-      document/katebuffer.cpp  document/katedialogs.cpp \
-      document/katehighlight.cpp  \
-      document/katecmd.cpp   \
-      document/katesyntaxdocument.cpp document/katecmds.cpp \
-      document/katedocument.cpp    document/katetextline.cpp \
-      view/kateundohistory.cpp \
-      view/kateview.cpp \
-      view/kateviewdialog.cpp \
-      interfaces/interfaces.cpp
+		  microkde/kcolorbtn.cpp \
+		  \
+		  \
+		  qt3back/qregexp3.cpp \
+		  ktexteditor/ktexteditor.cpp \
+		  document/katebuffer.cpp  document/katedialogs.cpp \
+		  document/katehighlight.cpp  \
+		  document/katecmd.cpp   \
+		  document/katesyntaxdocument.cpp document/katecmds.cpp \
+		  document/katedocument.cpp    document/katetextline.cpp \
+		  view/kateundohistory.cpp \
+		  view/kateview.cpp \
+		  view/kateviewdialog.cpp \
+		  interfaces/interfaces.cpp
 
-INTERFACES  = 
-INCLUDEPATH += $(OPIEDIR)/include \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-      $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-DEPENDPATH  += $(OPIEDIR)/include
+INTERFACES	= 
+INCLUDEPATH	+= $(OPIEDIR)/include \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/document \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/view \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
+			$(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
-TARGET    = tinykate
+TARGET		= tinykate
 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
index 976f1db..5d21f15 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
+++ b/noncore/apps/tinykate/libkate/microkde/kcolorbtn.cpp
@@ -14,38 +14,36 @@
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdialog.h>
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qapplication.h>
 #include <kglobalsettings.h>
-//#include "kcolordialog.h"
+#include "kcolordialog.h"
 #include "kcolorbtn.h"
 
-#include <opie/colordialog.h>
-
 KColorButton::KColorButton( QWidget *parent, const char *name )
   : QPushButton( parent, name ), dragFlag(false)
 {
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
 
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-          const char *name )
+			    const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
 {
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
   connect (this, SIGNAL(clicked()), this, SLOT(chooseColor()));
 }
 
 void KColorButton::setColor( const QColor &c )
 {
   col = c;
   repaint( false );
 }
@@ -66,21 +64,21 @@ void KColorButton::drawButtonLabel( QPainter *painter )
     qDrawPlainRect( painter, l+b+1, t+b+1, w-b*2, h-b*2, lnCol, 1, 0 );
     b++;
     painter->fillRect( l+b+1, t+b+1, w-b*2, h-b*2, fillCol );
   } else {
     qDrawPlainRect( painter, l+b, t+b, w-b*2, h-b*2, lnCol, 1, 0 );
     b++;
     painter->fillRect( l+b, t+b, w-b*2, h-b*2, fillCol );
   }
 }
 
 void KColorButton::chooseColor()
 {
-  QColor newCol=OColorDialog::getColor( col);
-  if( newCol != QDialog::Rejected )
+  if( KColorDialog::getColor( col) == QDialog::Rejected )
   {
-  col=newCol;
+    return;
+  }
+
   repaint( false );
   emit changed( col );
-  }
 }
 
diff --git a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
index 1d5c27e..0f831cd 100644
--- a/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
+++ b/noncore/apps/tinykate/libkate/microkde/kcolordialog.h
@@ -1,16 +1,14 @@
 #ifndef MINIKDE_KCOLORDIALOG_H
 #define MINIKDE_KCOLORDIALOG_H
 
 #include <qcolor.h>
-#include <opie/colordialog.h>
 
-class KColorDialog : OColorDialog
+class KColorDialog
 {
-    Q_OBJECT
   public:
     enum { Accepted };
   
     static int getColor( const QColor & );
 };
 
 #endif
diff --git a/noncore/apps/tinykate/libkate/view/kateview.cpp b/noncore/apps/tinykate/libkate/view/kateview.cpp
index de81d0f..af3b30d 100644
--- a/noncore/apps/tinykate/libkate/view/kateview.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateview.cpp
@@ -2187,31 +2187,33 @@ bool KateView::askReplaceEnd() {
     // replace finished
     str = i18n("%1 replacement(s) made").arg(replaces);
     KMessageBox::information(this, str, i18n("Replace"));
     return true;
   }
 
   // ask for continue
   if (!(s.flags & KateView::sfBackward)) {
     // forward search
     str = i18n("%1 replacement(s) made.\n"
                "End of document reached.\n"
                "Continue from the beginning?").arg(replaces);
-    query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop"));
+    query = KMessageBox::questionYesNo(this, str, i18n("Replace"),
+    i18n("Continue"), i18n("Stop"));
   } else {
     // backward search
     str = i18n("%1 replacement(s) made.\n"
                 "Beginning of document reached.\n"
                 "Continue from the end?").arg(replaces);
-    query = KMessageBox::questionYesNo(this, str, i18n("Continue"), i18n("Stop"));
+    query = KMessageBox::questionYesNo(this, str, i18n("Replace"),
+                i18n("Continue"), i18n("Stop"));
   }
   replaces = 0;
   continueSearch(s);
   return (query == KMessageBox::No);
 }
 
 void KateView::replaceSlot() {
   doReplaceAction(replacePrompt->result(),true);
 }
 
 void KateView::installPopup(QPopupMenu *rmb_Menu)
 {
@@ -2257,25 +2259,24 @@ void KateView::writeSessionConfig(KateConfig *config)
 {
   config->writeEntry("XPos",myViewInternal->xPos);
   config->writeEntry("YPos",myViewInternal->yPos);
   config->writeEntry("CursorX",myViewInternal->cursor.x);
   config->writeEntry("CursorY",myViewInternal->cursor.y);
   config->writeEntry("IconBorder on", myIconBorder);
 }
 
 void KateView::configDialog()
 {
 
 #warning fixme
-	QScrollView *pScroll;
 
 #if 1 
   KDialogBase *kd = new KDialogBase(KDialogBase::IconList,
                                     i18n("Configure Editor"),
                                     KDialogBase::Ok | KDialogBase::Cancel |
                                     KDialogBase::Help ,
                                     KDialogBase::Ok, this, "tabdialog");
 
   // color options
   QFrame *page=kd->addPage(i18n("Colors"));
   (new QVBoxLayout(page))->setAutoAdd(true);
   ColorConfig *colorConfig = new ColorConfig(page);
@@ -2294,51 +2295,48 @@ void KateView::configDialog()
 
   IndentConfigTab *indentConfig = new IndentConfigTab(page, this);
 
   // select options
   page=kd->addPage(i18n("Select"));
   (new QVBoxLayout(page))->setAutoAdd(true);
 
   SelectConfigTab *selectConfig = new SelectConfigTab(page, this);
 
   // edit options
   page=kd->addPage(i18n("Edit"));
   (new QVBoxLayout(page))->setAutoAdd(true);
-  pScroll=new QScrollView(page);
+
   EditConfigTab *editConfig = new EditConfigTab(page, this);
-  pScroll->addChild(editConfig);
 
 
 
   HighlightDialogPage *hlPage;
   HlManager *hlManager;
   HlDataList hlDataList;
   ItemStyleList defaultStyleList;
 
   hlManager = HlManager::self();
 
   defaultStyleList.setAutoDelete(true);
   hlManager->getDefaults(defaultStyleList);
 
   hlDataList.setAutoDelete(true);
   //this gets the data from the KateConfig object
   hlManager->getHlDataList(hlDataList);
 
   page=kd->addPage(i18n("Highlighting"));
   (new QVBoxLayout(page))->setAutoAdd(true);
-  pScroll=new QScrollView(page);
-  hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, pScroll->viewport());
-  pScroll->addChild(hlPage);
 
-  kd->showMaximized(); 
+  hlPage = new HighlightDialogPage(hlManager, &defaultStyleList, &hlDataList, 0, page);
+  kd->showMaximized();
  if (kd->exec()) {
     // color options
     colorConfig->getColors(colors);
     myDoc->setFont (fontConfig->getFont());
 
     applyColors();
     // indent options
     indentConfig->getData(this);
     // select options
     selectConfig->getData(this);
     // edit options
     editConfig->getData(this);