[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kate/part
From: Christoph Cullmann <cullmann () kde ! org>
Date: 2007-05-20 12:53:32
Message-ID: 1179665612.742386.16723.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 666627 by cullmann:
more modes fixes
M +0 -1 CMakeLists.txt
M +10 -3 dialogs/filetypeconfigwidget.ui
D dialogs/hlconfigwidget.ui
M +0 -77 dialogs/katedialogs.cpp
M +0 -27 dialogs/katedialogs.h
M +13 -25 kateglobal.cpp
M +19 -12 mode/katemodeconfigpage.cpp
M +4 -3 mode/katemodeconfigpage.h
--- trunk/KDE/kdelibs/kate/part/CMakeLists.txt #666626:666627
@@ -104,7 +104,6 @@
dialogs/cursorconfigwidget.ui
dialogs/editconfigwidget.ui
dialogs/filetypeconfigwidget.ui
-dialogs/hlconfigwidget.ui
dialogs/indentationconfigwidget.ui
dialogs/opensaveconfigwidget.ui
dialogs/modonhdwidget.ui
--- trunk/KDE/kdelibs/kate/part/dialogs/filetypeconfigwidget.ui #666626:666627
@@ -210,15 +210,22 @@
</layout>
</widget>
</item>
- <item row="2" column="2" colspan="2" >
+ <item row="2" column="4" >
+ <widget class="QPushButton" name="btnDownload" >
+ <property name="text" >
+ <string>Download Highlighting Files...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
- <height>40</height>
+ <width>160</width>
+ <height>71</height>
</size>
</property>
</spacer>
--- trunk/KDE/kdelibs/kate/part/dialogs/katedialogs.cpp #666626:666627
@@ -816,83 +816,6 @@
//END KateScriptConfigPage
-//BEGIN KateHlConfigPage
-KateHlConfigPage::KateHlConfigPage (QWidget *parent, KateDocument *doc)
- : KateConfigPage (parent, "")
- , m_doc (doc)
-{
- ui = new Ui::HlConfigWidget();
- ui->setupUi( this );
-
- for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
- if (KateHlManager::self()->hlSection(i).length() > 0)
- ui->cmbHl->addItem(KateHlManager::self()->hlSection(i) + QString ("/")
- + KateHlManager::self()->hlNameTranslated(i));
- else
- ui->cmbHl->addItem(KateHlManager::self()->hlNameTranslated(i));
- }
-
- connect( ui->btnDownload, SIGNAL(clicked()), this, SLOT(hlDownload()) );
- connect( ui->cmbHl, SIGNAL(activated(int)), this, SLOT(hlChanged(int)) );
-
- ui->txtAuthor->setWordWrap (true);
- ui->txtLicense->setWordWrap (true);
-
- int currentHl = m_doc ? m_doc->hlMode() : 0;
- ui->cmbHl->setCurrentIndex( currentHl );
- hlChanged( currentHl );
-}
-
-KateHlConfigPage::~KateHlConfigPage ()
-{
-}
-
-void KateHlConfigPage::apply ()
-{
- // nothing changed, no need to apply stuff
- if (!hasChanged())
- return;
- m_changed = false;
-}
-
-void KateHlConfigPage::reload ()
-{
- // TODO: implement me
-}
-
-void KateHlConfigPage::hlChanged(int z)
-{
- writeback();
-
- KateHighlighting *hl = KateHlManager::self()->getHl( z );
-
- if (!hl)
- {
- return;
- }
-
- // split author string if needed into multiple lines !
- QStringList l= hl->author().split (QRegExp("[,;]"));
- ui->txtAuthor->setText (l.join ("<br>"));
-
- ui->txtLicense->setText (hl->license());
-}
-
-void KateHlConfigPage::writeback()
-{
-}
-
-void KateHlConfigPage::hlDownload()
-{
- KateHlDownloadDialog diag(this,"hlDownload",true);
- diag.exec();
-}
-
-void KateHlConfigPage::showMTDlg()
-{
-}
-//END KateHlConfigPage
-
//BEGIN KateHlDownloadDialog
KateHlDownloadDialog::KateHlDownloadDialog(QWidget *parent, const char *name, bool \
modal) : KDialog( parent )
--- trunk/KDE/kdelibs/kate/part/dialogs/katedialogs.h #666626:666627
@@ -310,33 +310,6 @@
KateScriptNewStuff *m_newStuff;
};
-class KateHlConfigPage : public KateConfigPage
-{
- Q_OBJECT
-
- public:
- KateHlConfigPage (QWidget *parent, KateDocument *doc);
- ~KateHlConfigPage ();
-
- public Q_SLOTS:
- void apply ();
- void reload ();
- void reset () {}
- void defaults () {}
-
- protected Q_SLOTS:
- void hlChanged(int);
- void hlDownload();
- void showMTDlg();
-
- private:
- void writeback ();
-
- Ui::HlConfigWidget *ui;
-
- KateDocument *m_doc;
-};
-
class KateHlDownloadDialog: public KDialog
{
Q_OBJECT
--- trunk/KDE/kdelibs/kate/part/kateglobal.cpp #666626:666627
@@ -263,7 +263,7 @@
int KateGlobal::configPages () const
{
- return 11;
+ return 10;
}
KTextEditor::ConfigPage *KateGlobal::configPage (int number, QWidget *parent)
@@ -289,18 +289,15 @@
return new KateSaveConfigTab (parent);
case 6:
- return new KateHlConfigPage (parent, 0);
+ return new ModeConfigPage (parent);
case 7:
- return new KateFileTypeConfigTab (parent);
-
- case 8:
return new KateEditKeyConfiguration (parent, 0);
- case 9:
+ case 8:
return new KatePartPluginConfigPage (parent);
- case 10:
+ case 9:
return new KateScriptConfigPage (parent);
default:
@@ -333,18 +330,15 @@
return i18n("Open/Save");
case 6:
- return i18n ("Highlighting");
+ return i18n("Modes");
case 7:
- return i18n("Filetypes");
-
- case 8:
return i18n ("Shortcuts");
- case 9:
+ case 8:
return i18n ("Plugins");
- case 10:
+ case 9:
return i18n("Scripts");
default:
@@ -377,18 +371,15 @@
return i18n("File Opening & Saving");
case 6:
- return i18n ("Highlighting Rules");
+ return i18n("Mode Specific Settings");
case 7:
- return i18n("Filetype Specific Settings");
-
- case 8:
return i18n ("Shortcuts Configuration");
- case 9:
+ case 8:
return i18n ("Plugin Manager");
- case 10:
+ case 9:
return i18n ("Script Manager");
default:
@@ -421,18 +412,15 @@
return KIcon("document-save");
case 6:
- return KIcon("source");
+ return KIcon("text-plain");
case 7:
- return KIcon("edit");
-
- case 8:
return KIcon("browser-go");
- case 9:
+ case 8:
return KIcon("connection-established");
- case 10:
+ case 9:
return KIcon("edit");
default:
--- trunk/KDE/kdelibs/kate/part/mode/katemodeconfigpage.cpp #666626:666627
@@ -53,7 +53,7 @@
#define KATE_FT_HOWMANY 1024
//END Includes
-KateFileTypeConfigTab::KateFileTypeConfigTab( QWidget *parent )
+ModeConfigPage::ModeConfigPage( QWidget *parent )
: KateConfigPage( parent )
{
m_lastType = -1;
@@ -74,6 +74,7 @@
connect( ui->btnDelete, SIGNAL(clicked()), this, SLOT(deleteType()) );
ui->btnMimeTypes->setIcon(QIcon(SmallIcon("wizard")));
connect(ui->btnMimeTypes, SIGNAL(clicked()), this, SLOT(showMTDlg()));
+ connect( ui->btnDownload, SIGNAL(clicked()), this, SLOT(hlDownload()) );
reload();
@@ -86,12 +87,12 @@
connect( ui->cmbHl, SIGNAL(activated(int)), this, SLOT(slotChanged()) );
}
-KateFileTypeConfigTab::~KateFileTypeConfigTab ()
+ModeConfigPage::~ModeConfigPage ()
{
qDeleteAll (m_types);
}
-void KateFileTypeConfigTab::apply()
+void ModeConfigPage::apply()
{
if (!hasChanged())
return;
@@ -101,7 +102,7 @@
KateGlobal::self()->modeManager()->save(m_types);
}
-void KateFileTypeConfigTab::reload()
+void ModeConfigPage::reload()
{
qDeleteAll (m_types);
m_types.clear();
@@ -117,17 +118,17 @@
update ();
}
-void KateFileTypeConfigTab::reset()
+void ModeConfigPage::reset()
{
reload ();
}
-void KateFileTypeConfigTab::defaults()
+void ModeConfigPage::defaults()
{
reload ();
}
-void KateFileTypeConfigTab::update ()
+void ModeConfigPage::update ()
{
m_lastType = -1;
@@ -147,7 +148,7 @@
ui->cmbFiletypes->setEnabled (ui->cmbFiletypes->count() > 0);
}
-void KateFileTypeConfigTab::deleteType ()
+void ModeConfigPage::deleteType ()
{
int type = ui->cmbFiletypes->currentIndex ();
@@ -159,7 +160,7 @@
}
}
-void KateFileTypeConfigTab::newType ()
+void ModeConfigPage::newType ()
{
QString newN = i18n("New Filetype");
@@ -182,7 +183,7 @@
update ();
}
-void KateFileTypeConfigTab::save ()
+void ModeConfigPage::save ()
{
if (m_lastType != -1)
{
@@ -196,7 +197,7 @@
}
}
-void KateFileTypeConfigTab::typeChanged (int type)
+void ModeConfigPage::typeChanged (int type)
{
save ();
@@ -250,7 +251,7 @@
m_lastType = type;
}
-void KateFileTypeConfigTab::showMTDlg()
+void ModeConfigPage::showMTDlg()
{
QString text = i18n("Select the MimeTypes you want for this file type.\nPlease \
note that this will automatically edit the associated file extensions as well."); \
QStringList list = ui->edtMimeTypes->text().split( QRegExp("\\s*;\\s*"), \
QString::SkipEmptyParts ); @@ -263,4 +264,10 @@
}
}
+void ModeConfigPage::hlDownload()
+{
+ KateHlDownloadDialog diag(this,"hlDownload",true);
+ diag.exec();
+}
+
// kate: space-indent on; indent-width 2; replace-tabs on;
--- trunk/KDE/kdelibs/kate/part/mode/katemodeconfigpage.h #666626:666627
@@ -33,13 +33,13 @@
class FileTypeConfigWidget;
}
-class KateFileTypeConfigTab : public KateConfigPage
+class ModeConfigPage : public KateConfigPage
{
Q_OBJECT
public:
- explicit KateFileTypeConfigTab( QWidget *parent );
- ~KateFileTypeConfigTab ();
+ explicit ModeConfigPage( QWidget *parent );
+ ~ModeConfigPage ();
public Q_SLOTS:
void apply();
@@ -54,6 +54,7 @@
void typeChanged (int type);
void showMTDlg();
void save ();
+ void hlDownload ();
private:
Ui::FileTypeConfigWidget *ui;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic