Hello community,
here is the log from the commit of package rocs for openSUSE:Factory checked in at 2012-03-13 09:39:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rocs (Old)
and /work/SRC/openSUSE:Factory/.rocs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rocs", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/rocs/rocs.changes 2012-02-03 10:26:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rocs.new/rocs.changes 2012-03-13 09:39:25.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 2 23:27:26 CET 2012 - dmueller@suse.de
+
+- update to 4.8.1
+ * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details
+
+-------------------------------------------------------------------
Old:
----
rocs-4.8.0.tar.bz2
New:
----
rocs-4.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rocs.spec ++++++
--- /var/tmp/diff_new_pack.EmkDz9/_old 2012-03-13 09:39:26.000000000 +0100
+++ /var/tmp/diff_new_pack.EmkDz9/_new 2012-03-13 09:39:26.000000000 +0100
@@ -15,8 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: rocs
-Version: 4.8.0
+Version: 4.8.1
Release: 0
Summary: Graph Theory IDE
License: GPL-3.0+
++++++ rocs-4.8.0.tar.bz2 -> rocs-4.8.1.tar.bz2 ++++++
Files old/rocs-4.8.0/doc/index.cache.bz2 and new/rocs-4.8.1/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructure.h new/rocs-4.8.1/src/Core/DataStructure.h
--- old/rocs-4.8.0/src/Core/DataStructure.h 2011-11-04 15:35:33.000000000 +0100
+++ new/rocs-4.8.1/src/Core/DataStructure.h 2012-03-02 13:26:40.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of Rocs.
Copyright 2004-2011 Tomaz Canabrava
Copyright 2010-2011 Wagner Reck
@@ -6,7 +6,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
+ License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
@@ -14,7 +14,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
+ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -50,7 +50,7 @@
* self pointer to DataStructure
*/
boost::weak_ptr<DataStructure> q;
-
+
QList< DataPtr > _data;
QList< PointerPtr> _pointers;
@@ -129,7 +129,7 @@
DataPtr data(const QString& name = i18n("Untitled"));
virtual void remove(DataPtr n);
-
+
/**
* Unregister pointer from data structure. Do not use this for actual removal of pointer.
* To remove a pointer \see Pointer::remove().
@@ -190,12 +190,12 @@
protected:
DataPtr addData(DataPtr data);
PointerPtr addPointer(PointerPtr pointer);
-
+
protected:
DataStructure(Document *parent = 0);
-
+
/**
- * overwrites the current DataStructure with all values (Data and Pointer)
+ * overwrites the current DataStructure with all values (Data and Pointer)
* from the given datastructure object.
* \param boost::shared_ptr<DataStructure> other
* \return void
@@ -212,7 +212,7 @@
pi->importStructure(other);
return pi;
}
-
+
private:
boost::shared_ptr<DataStructurePrivate> d;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructurePluginInterface.cpp new/rocs-4.8.1/src/Core/DataStructurePluginInterface.cpp
--- old/rocs-4.8.0/src/Core/DataStructurePluginInterface.cpp 2011-10-11 16:46:09.000000000 +0200
+++ new/rocs-4.8.1/src/Core/DataStructurePluginInterface.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -1,10 +1,10 @@
-/*
+/*
This file is part of Rocs.
Copyright 2011 Tomaz Canabrava
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -55,3 +55,12 @@
}
return QString();
}
+
+
+QString DataStructurePluginInterface::internalName()
+{
+ if(DataStructurePluginManager::self()->pluginInfo(this).isValid()){
+ return DataStructurePluginManager::self()->pluginInfo(this).pluginName();
+ }
+ return QString();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/DataStructurePluginInterface.h new/rocs-4.8.1/src/Core/DataStructurePluginInterface.h
--- old/rocs-4.8.0/src/Core/DataStructurePluginInterface.h 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Core/DataStructurePluginInterface.h 2012-03-02 13:26:40.000000000 +0100
@@ -1,10 +1,10 @@
-/*
+/*
This file is part of Rocs.
Copyright 2011 Tomaz Canabrava
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -57,8 +57,17 @@
*/
virtual bool canConvertFrom(Document* doc) const = 0;
+ /** @brief return the translated name to be used in user visible strings
+ */
QString name();
+ /** @brief return the internal name from plugin.
+ * This string is not translated and should be used to differentiate
+ * the data structures. It is useful when some piece of code is only
+ * applicable to some kind of structures
+ */
+ QString internalName();
+
virtual QGraphicsItem * dataItem (DataPtr data) const = 0;
virtual QGraphicsItem * pointerItem (PointerPtr pointer) const = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/Document.cpp new/rocs-4.8.1/src/Core/Document.cpp
--- old/rocs-4.8.0/src/Core/Document.cpp 2011-10-11 16:46:09.000000000 +0200
+++ new/rocs-4.8.1/src/Core/Document.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of Rocs.
Copyright 2008-2011 Tomaz Canabrava
Copyright 2008 Ugo Sangiori
@@ -7,7 +7,7 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -74,7 +74,7 @@
d->_engineBackend = new QtScriptBackend(this);
d->_dataStructureType = DataStructurePluginManager::self()->actualPlugin();
d->_modified = false;
-
+
qDebug() << "------=======------======";
qDebug() << " Document Constructor ";
qDebug() << d->_dataStructureType->name();
@@ -363,48 +363,48 @@
/**
* A Document Internal format may look like this:
- *
+ *
* # '#'s are comments.
- *
+ *
* [Document Properties] # Canvas Size and Data Structure initialization.
- * Width : [integer]
- * Height : [integer]
- * DataStructurePlugin : [string]
- *
+ * Width : [integer]
+ * Height : [integer]
+ * DataStructurePlugin : [string]
+ *
* # Data Structre Definitions.
* # Data Structures are layered, so there can be N of them.
* # Every Data and Pointer below a declaration of a DataStructure
* # belongs to that data structure.
- *
- * [DataStructure Name1]
- *
+ *
+ * [DataStructure Name1]
+ *
* DataColor : [RGB in hex] # Color of newly created Datas ( Nodes )
* Pointercolor : [RBG in Hex] # Color of newly created Datas ( Nodes )
* name : [string] # Name of the data structure acessible in the scripting interface.
- *
+ *
* visibility : [bool] # is this DataStructure visible?
- *
+ *
* ShowNamesInData : [bool] # should the canvas show the name of the data on the screen?
* ShowNamesInNPointers : [bool] # ↑
* ShowValuesInData : [bool] # ↑
* ShowValuesInPointers : [bool] # ↑
- *
+ *
* PluginDefinedProperty1 : propertyValue; # the plugins can define other properties for the data structure.
* PluginDefinedProperty1 : propertyValue;
* PluginDefinedProperty1 : propertyValue;
- *
+ *
* UserDefinedProperty1 : propertyValue1 # the user can define other properties for the data structure.
* UserDefinedProperty2 : propertyValue2
* UserDefinedProperty3 : propertyValue3
- *
- * [Data 1]
+ *
+ * [Data 1]
* x : [real]
* y : [real]
* color : [string in "0xFFFFFF" format]
* name : [string]
* value : [string]
* size : [float]
- *
+ *
* property1 : propertyValue1
* property2 : propertyValue2
* property3 : propertyValue3
@@ -416,18 +416,18 @@
* name : [string]
* value : [string]
* size : [float]
- *
+ *
* property1 : propertyValue1
* property2 : propertyValue2
* property3 : propertyValue3
- *
+ *
* [Pointer 1 -> 2]
* name : [string]
* value : [string]
* style : [string]
* color : [string in "0xFFFFFF" format]
* width : [float]
- *
+ *
* property1 : propertyValue1
* property2 : propertyValue2
* property3 : propertyValue3
@@ -445,7 +445,7 @@
QTextStream stream(&saveFile);
stream.setCodec("UTF-8");
-
+
d->_buf = QString("[Document Properties] \n")
% QString("top : ") % QString::number(top()) % QChar('\n')
% QString("bottom : ") % QString::number(bottom()) % QChar('\n')
@@ -453,7 +453,7 @@
% QString("right : ") % QString::number(right()) % QChar('\n')
% QString("DataStructurePlugin : ") % DataStructurePluginManager::self()->actualPlugin()->name() % QChar('\n')
% QChar('\n');
-
+
for (int i = 0; i < d->_dataStructures.count(); i++) {
DataStructurePtr g = d->_dataStructures.at(i);
@@ -544,21 +544,21 @@
continue;
}
else if(str.startsWith("[Document Properties]")){
-
+
QString dataLine = in.readLine().simplified();
while (!in.atEnd() && !dataLine.isEmpty()) {
/**/ if (dataLine.startsWith("top :")) setTop(dataLine.section(' ',2).toInt());
else if (dataLine.startsWith("bottom :")) setBottom(dataLine.section(' ',2).toInt());
else if (dataLine.startsWith("left :")) setLeft(dataLine.section(' ',2).toInt());
else if (dataLine.startsWith("right :")) setRight(dataLine.section(' ',2).toInt());
-
+
// TODO: Wagner, How this thing works?
else if (dataLine.startsWith("DataStructurePlugin :")){
DataStructurePluginManager::self()->setDataStructurePlugin(dataLine.section(' ',2));
d->_dataStructureType = DataStructurePluginManager::self()->actualPlugin();
}
else if ( !dataLine.isEmpty()) break; // go to the last if and finish populating.
- dataLine = in.readLine().simplified();
+ dataLine = in.readLine().simplified();
}
tmpObject = this;
}
@@ -599,7 +599,7 @@
PointerPtr tmpPointer = tmpDataStructure->addPointer(tmpDataStructure->dataList().at(nameFrom.toInt()),
tmpDataStructure->dataList().at(nameTo.toInt()));
-
+
QString dataLine = in.readLine().simplified();
while (!in.atEnd() && !dataLine.isEmpty()) {
/**/ if (dataLine.startsWith("width :")) tmpPointer->setWidth(dataLine.section(' ',2).toInt());
@@ -607,7 +607,7 @@
else if (dataLine.startsWith("color :")) tmpPointer->setColor(dataLine.section(' ',2));
else if (dataLine.startsWith("width :")) tmpPointer->setColor(dataLine.section(' ',2).toFloat());
else if (dataLine.startsWith("style :")) tmpPointer->setColor(dataLine.section(' ',2));
-
+
else if ( !dataLine.isEmpty()) break; // go to the last if and finish populating.
dataLine = in.readLine().simplified();
}
@@ -638,6 +638,12 @@
return d->_dataStructureType->name();
}
+QString Document::dataStructureInternalName() const
+{
+ return d->_dataStructureType->internalName();
+}
+
+
DataStructurePluginInterface* Document::dataStructurePlugin() const
{
return d->_dataStructureType;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Core/Document.h new/rocs-4.8.1/src/Core/Document.h
--- old/rocs-4.8.0/src/Core/Document.h 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Core/Document.h 2012-03-02 13:26:40.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of Rocs.
Copyright 2008-2011 Tomaz Canabrava
Copyright 2008 Ugo Sangiori
@@ -7,7 +7,7 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -80,9 +80,12 @@
*/
virtual void cleanUpBeforeConvert();
- /** @brief return the name of data structure used to build this document. */
+ /** @brief return the translated name of data structure used to build this document. */
QString dataStructureTypeName()const;
+ /** @brief return the internal name (not translated) of data structure used to build this document.*/
+ QString dataStructureInternalName()const;
+
DataStructurePluginInterface * dataStructurePlugin() const;
public slots:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Interface/MainWindow.cpp new/rocs-4.8.1/src/Interface/MainWindow.cpp
--- old/rocs-4.8.0/src/Interface/MainWindow.cpp 2011-12-20 20:13:22.000000000 +0100
+++ new/rocs-4.8.1/src/Interface/MainWindow.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/*
This file is part of Rocs.
Copyright 2008-2011 Tomaz Canabrava
Copyright 2008 Ugo Sangiori
@@ -7,7 +7,7 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -128,7 +128,7 @@
DocumentManager::self()->loadDocument();
GraphicsLayout::self()->setViewStyleDataNode(Settings::dataNodeDisplay());
- GraphicsLayout::self()->setViewStyleDataEdge(Settings::dataEdgeDisplay());
+ GraphicsLayout::self()->setViewStyleDataEdge(Settings::dataEdgeDisplay());
}
MainWindow::~MainWindow()
@@ -136,7 +136,7 @@
Settings::setVSplitterSizeTop ( _vSplitter->sizes() [0] );
Settings::setVSplitterSizeBottom ( _vSplitter->sizes() [1] );
Settings::setHSplitterSizeLeft ( _hSplitter->sizes() [0] );
- Settings::setHSplitterSizeRight ( _hSplitter->sizes() [1] );
+ Settings::setHSplitterSizeRight ( _hSplitter->sizes() [1] );
Settings::setHScriptSplitterSizeLeft ( _hScriptSplitter->sizes() [0] );
Settings::setHScriptSplitterSizeRight ( _hScriptSplitter->sizes() [1] );
@@ -164,18 +164,18 @@
// setup upper half
QWidget *leftPanel = setupWhiteboardPanel(); // graph properties
_graphVisualEditor = GraphVisualEditor::self(); // graph editor whiteboard
-
+
_hSplitter = new QSplitter ( this );
_hSplitter->setOrientation( Qt::Horizontal );
_hSplitter->addWidget (leftPanel);
_hSplitter->addWidget (_graphVisualEditor);
-
+
// setup lower half
QWidget *scriptPanel = setupScriptPanel();
-
+
_vSplitter->addWidget ( _hSplitter );
_vSplitter->addWidget ( scriptPanel );
-
+
_hScriptSplitter->setSizes ( QList<int>() << Settings::hScriptSplitterSizeLeft() << Settings::hScriptSplitterSizeRight() << 80 );
_vSplitter->setSizes ( QList<int>() << Settings::vSplitterSizeTop() << Settings::vSplitterSizeBottom() );
_hSplitter->setSizes ( QList<int>() << Settings::hSplitterSizeLeft() << Settings::hSplitterSizeRight() );
@@ -225,10 +225,10 @@
QWidget* MainWindow::setupScriptPanel()
-{
+{
_hScriptSplitter = new QSplitter( this );
_hScriptSplitter->setOrientation( Qt::Horizontal );
-
+
_codeEditor = new CodeEditor ( this );
_txtDebug = new KTextBrowser ( this );
_txtOutput = new KTextBrowser( this );
@@ -240,17 +240,17 @@
_selectListing = new QComboBox;
_selectListing->addItem( KIcon ( "accessories-text-editor" ), i18n("Program Messages"));
_selectListing->addItem( KIcon ( "tools-report-bug" ), i18n("Debug Messages"));
-
+
QWidget *header = new QWidget( this );
header->setLayout( new QHBoxLayout );
header->layout()->addWidget(new QLabel(i18n("Select output:")));
header->layout()->addWidget(_selectListing);
-
+
QWidget *listingWidget = new QWidget(this);
listingWidget->setLayout( new QVBoxLayout );
listingWidget->layout()->addWidget( header );
listingWidget->layout()->addWidget( stackedListing );
-
+
QToolBar *executeCommands = new QToolBar;
executeCommands->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );
executeCommands->setOrientation(Qt::Vertical);
@@ -259,19 +259,19 @@
_stopScript->setEnabled(false);
executeCommands->addAction(_runScript);
executeCommands->addAction(_stopScript);
-
+
connect(_runScript, SIGNAL(triggered()), this, SLOT(executeScript()));
connect(_stopScript, SIGNAL(triggered()), this, SLOT(stopScript()));
connect(_selectListing, SIGNAL(currentIndexChanged(int)), stackedListing, SLOT(setCurrentIndex(int)));
-
+
_hScriptSplitter->addWidget( _codeEditor );
_hScriptSplitter->addWidget( listingWidget );
-
+
QWidget *scriptInterface = new QWidget( this );
scriptInterface->setLayout( new QHBoxLayout );
scriptInterface->layout()->addWidget( _hScriptSplitter );
scriptInterface->layout()->addWidget( executeCommands );
-
+
return scriptInterface;
}
@@ -329,7 +329,7 @@
createAction("", i18n("Download Examples"), "download", SLOT(downloadNewExamples()), this);
createAction("", i18n("Upload script"), "upload", SLOT(uploadScript()), this);
createAction("document-save", i18n("Save All"), "save-all", Qt::Key_S, SLOT(saveAll()), this);
-
+
createAction("document-save-as", i18n("Possible Includes"), "possible_includes", SLOT(showPossibleIncludes()), this);
createAction("document-new", i18n("New Script"), "new-script", SLOT(newScript()), _codeEditor);
@@ -346,7 +346,7 @@
// EDIT actions
actionCollection()->addAction("delete-selected", new DeleteAction( i18n("Delete"), _graphVisualEditor->scene(), 0) );
-
+
KStandardAction::quit ( kapp, SLOT ( quit() ), actionCollection() );
}
@@ -417,26 +417,26 @@
QList pluginList;
QAction* action = 0;
unplugActionList ( "DS_plugins" );
-
+
QList < DataStructurePluginInterface*> avaliablePlugins = DataStructurePluginManager::self()->pluginsList();
-
+
QActionGroup * group = new QActionGroup(this);
-
+
int count = 0;
foreach ( DataStructurePluginInterface* p, avaliablePlugins ) {
action = new KAction ( p->name(), this );
action->setData(count++);
action->setCheckable(true);
-
+
if (p->name() == DataStructurePluginManager::self()->pluginName()){
action->setChecked(true);
}
-
+
action->setActionGroup(group);
-
+
connect ( action, SIGNAL (triggered(bool)),
DataStructurePluginManager::self(), SLOT(setDataStructurePlugin()));
-
+
pluginList.append ( action );
}
plugActionList ( "DS_plugins", pluginList );
@@ -525,7 +525,7 @@
KMessageBox::sorry ( this, i18n ( "This does not seem to be a graph file." ), i18n ( "Invalid file" ) );
return;
}
-
+
DocumentManager::self()->loadDocument(name);
}
@@ -556,7 +556,7 @@
int MainWindow::saveIfChanged(){
if ( DocumentManager::self()->activeDocument()->isModified() && !_codeEditor->isModified() ){
- const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
+ const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
"Changes on your graph document are unsaved. Do you want to save your changes?" ) );
if ( btnCode == KMessageBox::Yes ){
saveGraph();
@@ -564,7 +564,7 @@
return btnCode;
}
if ( !DocumentManager::self()->activeDocument()->isModified() && _codeEditor->isModified() ){
- const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
+ const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
"Changes on your script files are unsaved. Do you want to save all unsaved scripts?" ) );
if ( btnCode == KMessageBox::Yes ){
_codeEditor->saveAllScripts();
@@ -572,7 +572,7 @@
return btnCode;
}
if ( DocumentManager::self()->activeDocument()->isModified() && _codeEditor->isModified() ){
- const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
+ const int btnCode = KMessageBox::warningYesNoCancel ( this, i18n (
"Changes on your script files and on your graph document are unsaved. Do you want to save your graph document and all unsaved scripts?" ) );
if ( btnCode == KMessageBox::Yes ){
_codeEditor->saveAllScripts();
@@ -655,11 +655,12 @@
_txtDebug->clear();
QString script = text.isEmpty() ? _codeEditor->text() : text;
-
+ QString scriptPath = _codeEditor->document()->url().path();
IncludeManager inc;
- script = inc.include(script, _codeEditor->document()->url().path(),
- _codeEditor->document()->documentName());
+ script = inc.include(script,
+ scriptPath.isEmpty()? scriptPath : scriptPath.section('/', 0, -2),
+ _codeEditor->document()->documentName());
QtScriptBackend *engine = DocumentManager::self()->activeDocument()->engineBackend();
if (engine->isRunning() ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop new/rocs-4.8.1/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop
--- old/rocs-4.8.0/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/AssignValues/rocs_assignvaluesplugin.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -23,6 +23,7 @@
Name[et]=Väärtuste omistamine
Name[fi]=Sijoita arvot
Name[fr]=Affectation de valeurs
+Name[gl]=Asignar valores
Name[hu]=Értékhozzárendelés
Name[it]=Assegna valori
Name[kk]=Мәндерін келтіру
@@ -36,6 +37,7 @@
Name[pl]=Przypisz wartości
Name[pt]=Atribuir Valores
Name[pt_BR]=Atribuir valores
+Name[sk]=Priradiť hodnoty
Name[sv]=Tilldela värden
Name[ug]=تەقسىملەنگەن قىممەتلەر
Name[uk]=Додавання значень
@@ -52,6 +54,7 @@
Comment[et]=Väärtuste omistamine graafi seostele ja tippudele.
Comment[fi]=Sijoita arvot graafin viivoihin ja solmuihin.
Comment[fr]=Affecte des valeurs aux arêtes et aux sommets d'un graphe.
+Comment[gl]=Asignarvalores aos bordos e nodos do grafo.
Comment[hu]=Értékek hozzárendelése a gráf éleihez és csomópontokhoz.
Comment[it]=Assegna valori ad archi e nodi di un grafo.
Comment[kk]=Графтың қырлары мен төбелерінің әндерін келтіру.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop new/rocs-4.8.1/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop
--- old/rocs-4.8.0/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/DataStructure/Graph/rocs_GraphStructure.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -43,6 +43,7 @@
Name[pl]=Graf
Name[pt]=Grafo
Name[pt_BR]=Grafo
+Name[sk]=Graf
Name[sv]=Graf
Name[ug]=گرافىك
Name[uk]=Граф
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.cpp new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.cpp
--- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.cpp 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.cpp 2012-02-29 23:05:13.000000000 +0100
@@ -44,9 +44,9 @@
return 0;
}
-void ListNode::pointTo(boost::shared_ptr<ListNode> to )
+void ListNode::pointTo(ListNode* to )
{
- addPointer(to);
+ addPointer(to->getData());
}
boost::shared_ptr<ListNode> ListNode::next() const{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.h new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.h
--- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListNode.h 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListNode.h 2012-02-29 23:05:13.000000000 +0100
@@ -35,7 +35,7 @@
public slots:
QScriptValue front();
- void pointTo(boost::shared_ptr<ListNode> to);
+ void pointTo(ListNode* to);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.cpp new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.cpp
--- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.cpp 2011-12-02 22:31:47.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -102,12 +102,12 @@
if (m_building) {
return addData(n);;
}
-
+
if (m_begin){
boost::shared_ptr<ListNode> tmp = m_begin;
while (tmp->next() != 0) tmp = tmp->next();
- tmp->pointTo(n);
+ tmp->pointTo(n.get());
}else{
m_begin = n;
}
@@ -121,6 +121,8 @@
if (m_begin == n){
m_begin = boost::static_pointer_cast<ListNode>(n)->next();
}
+ foreach(PointerPtr p, n->in_pointers())
+ p->remove();
DataStructure::remove(n);
arrangeNodes();
}
@@ -130,9 +132,9 @@
return m_begin->scriptValue();
}
-void Rocs::ListStructure::setBegin(boost::shared_ptr< ListNode > node)
+void Rocs::ListStructure::setBegin(Data* node)
{
- m_begin = node;
+ m_begin = boost::static_pointer_cast<ListNode>(node->getData());
arrangeNodes();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.h new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.h
--- old/rocs-4.8.0/src/Plugins/DataStructure/LinkedList/ListStructure.h 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Plugins/DataStructure/LinkedList/ListStructure.h 2012-02-29 23:05:13.000000000 +0100
@@ -54,7 +54,7 @@
virtual void remove(PointerPtr e);
QScriptValue begin();
- void setBegin(boost::shared_ptr<ListNode> node);
+ void setBegin(Data* node);
QScriptValue createNode(const QString &name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop
--- old/rocs-4.8.0/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/FilePlugins/DotFilePlugin/rocs_dotFilePlugin.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -21,6 +21,7 @@
Name[et]=Dot-faili plugin
Name[fi]=Dot-tiedostoliitännäinen
Name[ga]=Breisán Comhad Dot
+Name[gl]=Engadido Punto Ficheiro
Name[hu]=DOT-fájl modul
Name[it]=Estensione per file Dot
Name[kk]=Dot файлдар плагині
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop
--- old/rocs-4.8.0/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/FilePlugins/GMLParser/rocs_GMLParser.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -42,6 +42,7 @@
Name[pt]=Ficheiro GML
Name[pt_BR]=Arquivo GML
Name[ru]=Файл GML
+Name[sk]=Súbor GML
Name[sv]=GML-fil
Name[ug]=GML ھۆججىتى
Name[uk]=Файл GML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop
--- old/rocs-4.8.0/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/FilePlugins/TXTParser/rocs_plaintxtplugin.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -42,6 +42,7 @@
Name[pt]=Ficheiro TXT
Name[pt_BR]=Arquivo TXT
Name[ru]=Простой текстовый файл
+Name[sk]=Súbor TXT
Name[sv]=TXT-fil
Name[ug]=TXT ھۆججىتى
Name[uk]=Файл TXT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop
--- old/rocs-4.8.0/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/FilePlugins/dotParser/rocs_dotParser.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -40,6 +40,7 @@
Name[pt]=Ficheiro do Dot
Name[pt_BR]=Arquivo Dot
Name[ru]=Файл Dot
+Name[sk]=Súbor Dot
Name[sv]=Dot-fil
Name[uk]=Файл Dot
Name[x-test]=xxDot filexx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop new/rocs-4.8.1/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop
--- old/rocs-4.8.0/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/FilePlugins/kmlParser/rocs_kmlParser.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -43,6 +43,7 @@
Name[pt]=Ficheiro KML
Name[pt_BR]=Arquivo KML
Name[ru]=Файл KML
+Name[sk]=Súbor KML
Name[sv]=KML-fil
Name[ug]=KML ھۆججىتىنى
Name[uk]=Файл KML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop new/rocs-4.8.1/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop
--- old/rocs-4.8.0/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/GenerateGraph/rocs_generategraphplugin.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -38,6 +38,7 @@
Name[pl]=Generuj graf
Name[pt]=Gerar o Grafo
Name[pt_BR]=Gerar o grafo
+Name[sk]=Generovať graf
Name[sv]=Skapa graf
Name[uk]=Створення графу
Name[x-test]=xxGenerate Graphxx
@@ -53,6 +54,7 @@
Comment[et]=Uue graafiku genereerimine mustri järgi.
Comment[fi]=Tämä generoi uuden graafin mallin perusteella.
Comment[fr]=Cette fonction génère un nouveau graphe à l'aide d'un motif.
+Comment[gl]=Isto xera un gráfico novo segundo un padrón.
Comment[hu]=Új gráfot készít egy minta alapján.
Comment[it]=Questo genera un nuovo grafo secondo uno schema.
Comment[kk]=Үлгісі бойынша графты құру.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop new/rocs-4.8.1/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop
--- old/rocs-4.8.0/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/Plugins/TransformEdges/rocs_transformedgesplugin.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -22,6 +22,7 @@
Name[et]=Seoste teisendamine
Name[fi]=Muunna viivat
Name[fr]=Transformations des côtés
+Name[gl]=Transformar os bordos
Name[hu]=Élek átalakítása
Name[it]=Trasforma archi
Name[kk]=Қырларын түрлендіру
@@ -49,6 +50,7 @@
Comment[et]=Graafi seoste teisendamine vastava reegli järgi.
Comment[fi]=Muuntaa graafin viivat säännön mukaan.
Comment[fr]=Transforme les côtés d'un graphe à l'aide d'une règle de transformation.
+Comment[gl]=Transformar os bordos do grafo segundo unha regra de transformación.
Comment[hu]=A gráf éleinek átalakítása egy átalakítási szabály szerint.
Comment[it]=Trasforma gli archi di un grafo con una regola di trasformazione.
Comment[kk]=Ережесі бойынша графтың қырларын түрлендіру.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp new/rocs-4.8.1/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp
--- old/rocs-4.8.0/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp 2011-09-26 11:45:24.000000000 +0200
+++ new/rocs-4.8.1/src/Plugins/TransformEdges/transformedgestoolsplugin.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -4,7 +4,7 @@
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -60,19 +60,19 @@
Document* graphDoc = qobject_cast ( doc );
TransformEdgesWidget* dialog = new TransformEdgesWidget(graphDoc, 0);
-
+
QList< DataStructurePtr > dsList = graphDoc->dataStructures();
QStringList dsNames;
-
+
// be sure that only graph-datastructures are accessed by this plugin
- if (graphDoc->dataStructureTypeName() == "Graph" ) {
- foreach (DataStructurePtr ds, dsList) {
- dsNames << ds->name();
- }
+ if (graphDoc->dataStructureInternalName() == "Graph" ) {
+ foreach (DataStructurePtr ds, dsList) {
+ dsNames << ds->name();
+ }
}
-
+
dialog->addDataStructures(dsNames);
-
+
dialog->show();
return "";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/Scripts/IncludeManager.cpp new/rocs-4.8.1/src/Scripts/IncludeManager.cpp
--- old/rocs-4.8.0/src/Scripts/IncludeManager.cpp 2011-11-17 21:57:24.000000000 +0100
+++ new/rocs-4.8.1/src/Scripts/IncludeManager.cpp 2012-03-02 13:26:40.000000000 +0100
@@ -1,10 +1,10 @@
-/*
+/*
This file is part of Rocs.
Copyright 2010-2011 Wagner Reck
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
+ published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -43,9 +43,9 @@
QString IncludeManager::include ( const QString& script, const QString& actualPath, const QString &filename) {
int pos;
bool inComment = false;
-
if (!actualPath.isEmpty()) {
_actualDir = QDir(actualPath); // try the path of saved file
+ _tempPath << _actualDir;
if (!seekFile(filename).isNull()){
_wasIncluded << seekFile(filename);
}
@@ -96,7 +96,6 @@
}
QString str = lines.join("\n");
-// qDebug() << str;
return str;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocs-4.8.0/src/rocs.desktop new/rocs-4.8.1/src/rocs.desktop
--- old/rocs-4.8.0/src/rocs.desktop 2012-01-18 19:49:33.000000000 +0100
+++ new/rocs-4.8.1/src/rocs.desktop 2012-02-29 23:05:13.000000000 +0100
@@ -29,6 +29,7 @@
Name[pt]=Rocs
Name[pt_BR]=Rocs
Name[ru]=Rocs
+Name[sk]=Rocs
Name[sv]=Rocs
Name[tr]=Rocs
Name[ug]=Rocs
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org