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
@@ -121,7 +121,7 @@ KWBuffer::slotLoadFile()
 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;
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
@@ -71,7 +71,7 @@ void SyntaxDocument::setupModeList(bool force)
       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
@@ -105,6 +105,7 @@ void SyntaxDocument::setupModeList(bool force)
         }
     }
   }
+  config->write();
 //  config->sync();
 }
 
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,7 +1,7 @@
-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 \
@@ -24,61 +24,66 @@ HEADERS   = microkde/kapplication.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)
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
@@ -23,11 +23,9 @@
 #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)
 {
@@ -36,7 +34,7 @@ KColorButton::KColorButton( QWidget *parent, const char *name )
 }
 
 KColorButton::KColorButton( const QColor &c, QWidget *parent,
-          const char *name )
+                            const char *name )
   : QPushButton( parent, name ), col(c), dragFlag(false)
 {
 
@@ -75,12 +73,12 @@ void KColorButton::drawButtonLabel( QPainter *painter )
 
 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
@@ -2,11 +2,9 @@
 #define MINIKDE_KCOLORDIALOG_H
 
 #include <qcolor.h>
-#include <opie/colordialog.h>
 
-class KColorDialog : OColorDialog
+class KColorDialog
 {
-    Q_OBJECT
   public:
     enum { Accepted };
   
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
@@ -2196,13 +2196,15 @@ bool KateView::askReplaceEnd() {
     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);
@@ -2266,7 +2268,6 @@ void KateView::configDialog()
 {
 
 #warning fixme
-        QScrollView *pScroll;
 
 #if 1 
   KDialogBase *kd = new KDialogBase(KDialogBase::IconList,
@@ -2303,9 +2304,8 @@ void KateView::configDialog()
   // 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);
 
 
 
@@ -2325,11 +2325,9 @@ void KateView::configDialog()
 
   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);