Menu
▾
▴
[Tora-cvs] SF.net SVN: tora: [2768] trunk/tora/src
|
From: <su...@us...> - 2008-05-20 14:20:26
|
Revision: 2768
http://tora.svn.sourceforge.net/tora/?rev=2768&view=rev
Author: subik
Date: 2008-05-20 07:20:20 -0700 (Tue, 20 May 2008)
Log Message:
-----------
templates are compiled in now as resources. There are only addon templates stored in preferences now.
Modified Paths:
--------------
trunk/tora/src/CMakeLists.txt
trunk/tora/src/tora.qrc
trunk/tora/src/totemplate.cpp
Removed Paths:
-------------
trunk/tora/src/templates/CMakeLists.txt
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2008-05-20 08:18:52 UTC (rev 2767)
+++ trunk/tora/src/CMakeLists.txt 2008-05-20 14:20:20 UTC (rev 2768)
@@ -3,7 +3,6 @@
IF (WIN32)
ADD_SUBDIRECTORY(windows)
ENDIF (WIN32)
-ADD_SUBDIRECTORY(templates)
# Default: qsci2 as 3rd party lib!
Deleted: trunk/tora/src/templates/CMakeLists.txt
===================================================================
--- trunk/tora/src/templates/CMakeLists.txt 2008-05-20 08:18:52 UTC (rev 2767)
+++ trunk/tora/src/templates/CMakeLists.txt 2008-05-20 14:20:20 UTC (rev 2768)
@@ -1,7 +0,0 @@
-FILE( GLOB TORA_TEMPLATES *.tpl )
-INSTALL(
- FILES
- ${TORA_TEMPLATES}
- DESTINATION
- ${TORA_PLUGIN_DIR}/
-)
Modified: trunk/tora/src/tora.qrc
===================================================================
--- trunk/tora/src/tora.qrc 2008-05-20 08:18:52 UTC (rev 2767)
+++ trunk/tora/src/tora.qrc 2008-05-20 14:20:20 UTC (rev 2768)
@@ -1,8 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
-
- <file>icons/unittest.xpm</file>
-
<file>icons/addfile.xpm</file>
<file>icons/addindex.xpm</file>
<file>icons/addproject.xpm</file>
@@ -126,8 +123,14 @@
<file>icons/tree.xpm</file>
<file>icons/twirl.mng</file>
<file>icons/undo.xpm</file>
+ <file>icons/unittest.xpm</file>
<file>icons/up.xpm</file>
<file>icons/view.xpm</file>
<file>icons/writetablespace.xpm</file>
+
+ <file>templates/hints.tpl</file>
+ <file>templates/log4plsql.tpl</file>
+ <file>templates/sqlfunctions.tpl</file>
+
</qresource>
</RCC>
Modified: trunk/tora/src/totemplate.cpp
===================================================================
--- trunk/tora/src/totemplate.cpp 2008-05-20 08:18:52 UTC (rev 2767)
+++ trunk/tora/src/totemplate.cpp 2008-05-20 14:20:20 UTC (rev 2768)
@@ -63,15 +63,15 @@
#include "icons/totemplate.xpm"
-static std::map<QString, QString> DefaultText(void)
+
+static TemplatesMap DefaultText(void)
{
- std::map<QString, QString> def;
- QString file(toConfigurationSingle::Instance().pluginDir()); //toPluginPath();
+ TemplatesMap def;
#if !defined(TO_NO_ORACLE)
- def["PL/SQL Functions"] = file + "sqlfunctions.tpl";
- def["Optimizer Hints"] = file + "hints.tpl";
- def["Log4PL/SQL"] = file + "log4plsql.tpl";
+ def["PL/SQL Functions"] = ":/templates/sqlfunctions.tpl";
+ def["Optimizer Hints"] = ":/templates/hints.tpl";
+ def["Log4PL/SQL"] = ":/templates/log4plsql.tpl";
#endif
return def;
@@ -346,21 +346,8 @@
{
setupUi(this);
- std::map<QString, QString> def = DefaultText();
+ TemplatesMap def = DefaultText();
-// int tot = Tool->config("Number", "-1").toInt();
-// {
-// for (int i = 0;i < tot;i++)
-// {
-// QString num = QString::number(i).toLatin1();
-// QString root = Tool->config(num, "").toLatin1();
-// num += "file";
-// QString file = Tool->config(num, "");
-// new toTreeWidgetItem(FileList, root, file);
-// if (def.find(root) != def.end())
-// def.erase(def.find(root));
-// }
-// }
TemplatesMapIterator i(toConfigurationSingle::Instance().templates());
while (i.hasNext())
{
@@ -369,25 +356,26 @@
if (def.find(i.key()) != def.end())
def.erase(def.find(i.key()));
}
- for (std::map<QString, QString>::iterator i = def.begin();i != def.end();i++)
- new toTreeWidgetItem(FileList, (*i).first, (*i).second);
+ TemplatesMapIterator j(def);
+ while (j.hasNext())
+ {
+ j.next();
+ new toTreeWidgetItem(FileList, j.key(), j.value());
+ }
}
void toTemplatePrefs::saveSetting(void)
{
-// int i = 0;
TemplatesMap m;
+ TemplatesMap def = DefaultText();
for (toTreeWidgetItem *item = FileList->firstChild();item;item = item->nextSibling())
{
-// QString nam = QString::number(i).toLatin1();
-// Tool->setConfig(nam, item->text(0));
-// nam += "file";
-// Tool->setConfig(nam, item->text(1));
-// i++;
- m[item->text(0)] = item->text(1);
+ // save only user addons
+ if (!DefaultText().contains(item->text(0)))
+ m[item->text(0)] = item->text(1);
}
-// Tool->setConfig("Number", QString::number(i));
+
toConfigurationSingle::Instance().setTemplates(m);
}
@@ -758,20 +746,8 @@
void toTextTemplate::insertItems(toTreeWidget *parent, QToolBar *)
{
-// int tot = TemplateTool.config("Number", "-1").toInt();
- std::map<QString, QString> def = DefaultText();
-// {
-// for (int i = 0; i < tot; i++)
-// {
-// QString num = QString::number(i).toLatin1();
-// QString root = TemplateTool.config(num, "").toLatin1();
-// num += "file";
-// QString file = TemplateTool.config(num, "");
-// addFile(parent, root, file);
-// if (def.find(root) != def.end())
-// def.erase(def.find(root));
-// }
-// }
+ TemplatesMap def = DefaultText();
+
TemplatesMapIterator i(toConfigurationSingle::Instance().templates());
while (i.hasNext())
{
@@ -780,8 +756,12 @@
if (def.find(i.key()) != def.end())
def.erase(def.find(i.key()));
}
- for (std::map<QString, QString>::iterator i = def.begin();i != def.end();i++)
- addFile(parent, (*i).first, (*i).second);
+ TemplatesMapIterator j(def);
+ while (j.hasNext())
+ {
+ j.next();
+ addFile(parent, j.key(), j.value());
+ }
}
void toTextTemplate::addFile(toTreeWidget *parent, const QString &root, const QString &file)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|