diff options
| -rw-r--r-- | CHANGELOG | 8 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncExt.py | 4 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncUI.py | 39 | ||||
| -rw-r--r-- | mageiaSync/mageiaSyncUI.ui | 51 | ||||
| -rw-r--r-- | mageiaSync/mageiasync.py | 31 | ||||
| -rw-r--r-- | share/icons/mageiasync.png | bin | 0 -> 1987 bytes | |||
| -rw-r--r-- | share/icons/mageiasync.svg | 179 |
7 files changed, 203 insertions, 109 deletions
@@ -1,5 +1,13 @@ The modifications are: + - added shortcuts. + - added new feature : launching checks on demand + - corrected size display + - Correction of check being launched after stopping + - Correction : Reset the remaining field when stopped + - Added "Quit" button + - Correction of the icon + mageiasync 0.1.1 ------------ - bugfix: change the rename dialog box which was not synced. diff --git a/mageiaSync/mageiaSyncExt.py b/mageiaSync/mageiaSyncExt.py index 135d80c..ebd224f 100644 --- a/mageiaSync/mageiaSyncExt.py +++ b/mageiaSync/mageiaSyncExt.py @@ -122,6 +122,7 @@ class syncThread(QThread): try: self.process.terminate() self.lvM.emit("Process rsync stopped") + self.list=[] except: self.lvM.emit("Process rsync already stopped") # Init progressbar and speed counter @@ -186,9 +187,10 @@ class syncThread(QThread): if self.process.returncode != None: break self.lvM.emit("Ending with "+iso['nameWithPath']) - self.checkSignal.emit(iso['row']) if self.stopped: break + else: + self.checkSignal.emit(iso['row']) self.endSignal.emit(0) self.speedSignal.emit(0) self.progressSignal.emit(0) diff --git a/mageiaSync/mageiaSyncUI.py b/mageiaSync/mageiaSyncUI.py index fed1972..6ed3175 100644 --- a/mageiaSync/mageiaSyncUI.py +++ b/mageiaSync/mageiaSyncUI.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'mageiaSyncUI.ui' # -# Created: Sat Aug 30 20:19:01 2014 +# Created: Sat Nov 22 10:27:11 2014 # by: PyQt5 UI code generator 5.1.1 # # WARNING! All changes made in this file will be lost! @@ -12,7 +12,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_mainWindow(object): def setupUi(self, mainWindow): mainWindow.setObjectName("mainWindow") - mainWindow.resize(862, 587) + mainWindow.resize(820, 587) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap("share/icons/mageiasync.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + mainWindow.setWindowIcon(icon) + mainWindow.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) self.centralwidget = QtWidgets.QWidget(mainWindow) self.centralwidget.setObjectName("centralwidget") self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) @@ -85,6 +89,10 @@ class Ui_mainWindow(object): self.stop.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) self.stop.setObjectName("stop") self.horizontalLayout.addWidget(self.stop) + self.quit = QtWidgets.QPushButton(self.centralwidget) + self.quit.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) + self.quit.setObjectName("quit") + self.horizontalLayout.addWidget(self.quit) self.verticalLayout.addLayout(self.horizontalLayout) self.label = QtWidgets.QLabel(self.centralwidget) self.label.setObjectName("label") @@ -95,12 +103,13 @@ class Ui_mainWindow(object): self.verticalLayout.addWidget(self.lvText) mainWindow.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(mainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 862, 19)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 820, 19)) self.menubar.setObjectName("menubar") self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) self.menuFile.setObjectName("menuFile") self.menuSync = QtWidgets.QMenu(self.menubar) + self.menuSync.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates)) self.menuSync.setObjectName("menuSync") mainWindow.setMenuBar(self.menubar) self.statusbar = QtWidgets.QStatusBar(mainWindow) @@ -114,10 +123,13 @@ class Ui_mainWindow(object): self.actionPreferences.setObjectName("actionPreferences") self.actionRename = QtWidgets.QAction(mainWindow) self.actionRename.setObjectName("actionRename") + self.actionCheck = QtWidgets.QAction(mainWindow) + self.actionCheck.setObjectName("actionCheck") self.menuFile.addAction(self.actionUpdate) self.menuFile.addAction(self.actionPreferences) self.menuFile.addAction(self.actionQuit) self.menuSync.addAction(self.actionRename) + self.menuSync.addAction(self.actionCheck) self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuSync.menuAction()) @@ -130,19 +142,22 @@ class Ui_mainWindow(object): _translate = QtCore.QCoreApplication.translate mainWindow.setWindowTitle(_translate("mainWindow", "MageiaSync")) self.remoteDirLabel.setText(_translate("mainWindow", "Remote directory")) - self.selectAll.setText(_translate("mainWindow", "Select All")) + self.selectAll.setText(_translate("mainWindow", "Select &All")) self.localDirLabel.setText(_translate("mainWindow", "Local directory:")) self.Lsize.setText(_translate("mainWindow", "0 bytes")) self.label_2.setText(_translate("mainWindow", "kB/s")) self.label_3.setText(_translate("mainWindow", "Remaining:")) self.timeRemaining.setDisplayFormat(_translate("mainWindow", "H:mm:ss")) - self.syncGo.setText(_translate("mainWindow", "Do sync")) - self.stop.setText(_translate("mainWindow", "Stop")) + self.syncGo.setText(_translate("mainWindow", "&Do sync")) + self.stop.setText(_translate("mainWindow", "&Stop")) + self.quit.setText(_translate("mainWindow", "&Quit")) self.label.setText(_translate("mainWindow", "Report")) - self.menuFile.setTitle(_translate("mainWindow", "File")) - self.menuSync.setTitle(_translate("mainWindow", "Sync")) - self.actionUpdate.setText(_translate("mainWindow", "Update list")) - self.actionQuit.setText(_translate("mainWindow", "Quit")) - self.actionPreferences.setText(_translate("mainWindow", "Preferences")) - self.actionRename.setText(_translate("mainWindow", "Rename archives")) + self.menuFile.setTitle(_translate("mainWindow", "&File")) + self.menuSync.setTitle(_translate("mainWindow", "S&ync")) + self.actionUpdate.setText(_translate("mainWindow", "&Update list")) + self.actionQuit.setText(_translate("mainWindow", "&Quit")) + self.actionPreferences.setText(_translate("mainWindow", "&Preferences")) + self.actionRename.setText(_translate("mainWindow", "&Rename archives")) + self.actionCheck.setText(_translate("mainWindow", "&Check")) + self.actionCheck.setToolTip(_translate("mainWindow", "Check selected images")) diff --git a/mageiaSync/mageiaSyncUI.ui b/mageiaSync/mageiaSyncUI.ui index a86d314..a9933cd 100644 --- a/mageiaSync/mageiaSyncUI.ui +++ b/mageiaSync/mageiaSyncUI.ui @@ -6,13 +6,20 @@ <rect> <x>0</x> <y>0</y> - <width>862</width> + <width>820</width> <height>587</height> </rect> </property> <property name="windowTitle"> <string>MageiaSync</string> </property> + <property name="windowIcon"> + <iconset> + <normaloff>icons/mageiasync.png</normaloff>icons/mageiasync.png</iconset> + </property> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> <widget class="QWidget" name="centralwidget"> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -31,7 +38,7 @@ <locale language="English" country="UnitedStates"/> </property> <property name="text"> - <string>Select All</string> + <string>Select &All</string> </property> </widget> </item> @@ -157,7 +164,7 @@ <locale language="English" country="UnitedStates"/> </property> <property name="text"> - <string>Do sync</string> + <string>&Do sync</string> </property> </widget> </item> @@ -167,7 +174,17 @@ <locale language="English" country="UnitedStates"/> </property> <property name="text"> - <string>Stop</string> + <string>&Stop</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="quit"> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> + <property name="text"> + <string>&Quit</string> </property> </widget> </item> @@ -194,7 +211,7 @@ <rect> <x>0</x> <y>0</y> - <width>862</width> + <width>820</width> <height>19</height> </rect> </property> @@ -203,17 +220,21 @@ <locale language="English" country="UnitedStates"/> </property> <property name="title"> - <string>File</string> + <string>&File</string> </property> <addaction name="actionUpdate"/> <addaction name="actionPreferences"/> <addaction name="actionQuit"/> </widget> <widget class="QMenu" name="menuSync"> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> <property name="title"> - <string>Sync</string> + <string>S&ync</string> </property> <addaction name="actionRename"/> + <addaction name="actionCheck"/> </widget> <addaction name="menuFile"/> <addaction name="menuSync"/> @@ -221,22 +242,30 @@ <widget class="QStatusBar" name="statusbar"/> <action name="actionUpdate"> <property name="text"> - <string>Update list</string> + <string>&Update list</string> </property> </action> <action name="actionQuit"> <property name="text"> - <string>Quit</string> + <string>&Quit</string> </property> </action> <action name="actionPreferences"> <property name="text"> - <string>Preferences</string> + <string>&Preferences</string> </property> </action> <action name="actionRename"> <property name="text"> - <string>Rename archives</string> + <string>&Rename archives</string> + </property> + </action> + <action name="actionCheck"> + <property name="text"> + <string>&Check</string> + </property> + <property name="toolTip"> + <string>Check selected images</string> </property> </action> </widget> diff --git a/mageiaSync/mageiasync.py b/mageiaSync/mageiasync.py index 4faf149..07ea7a5 100644 --- a/mageiaSync/mageiasync.py +++ b/mageiaSync/mageiasync.py @@ -150,12 +150,30 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): content=QtCore.QTime.fromString(remainTime,"h:mm:ss") self.timeRemaining.setTime(content) + def manualChecks(self): + for iso in self.listIsos.selectedItems(): + path,name=iso.text().split('/') + try: + # Look for ISO in local list + item=self.model.findItems(name,QtCore.Qt.MatchExactly,1)[0] + except: + # Remote ISO is not yet in local directory. We add it in localList and create the directory + self.localAdd(path,name,0) + basedir=QtCore.QDir(self.destination) + basedir.mkdir(path) + item=self.model.findItems(name,QtCore.Qt.MatchExactly,1)[0] + row=self.model.indexFromItem(item).row() + self.checks(row) + def checks(self,isoIndex): - # process a checking for each iso + # processes a checking for each iso # launches a thread for each iso newThread=mageiaSyncExt.checkThread(self) self.checkThreads.append(newThread) - self.checkThreads[-1].setup(self.destination,self.model.data(self.model.index(isoIndex,0)) ,self.model.data(self.model.index(isoIndex,1)),isoIndex) + self.checkThreads[-1].setup(self.destination, + self.model.data(self.model.index(isoIndex,0)) , + self.model.data(self.model.index(isoIndex,1)), + isoIndex) self.checkThreads[-1].md5Signal.connect(self.md5Check) self.checkThreads[-1].sha1Signal.connect(self.sha1Check) self.checkThreads[-1].dateSignal.connect(self.dateCheck) @@ -298,17 +316,19 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): if self.selectAllState : for i in range(self.listIsos.count()): self.listIsos.item(i).setSelected(True) - self.selectAll.setText("Unselect all") + self.selectAll.setText("Unselect &All") else: for i in range(self.listIsos.count()): self.listIsos.item(i).setSelected(False) - self.selectAll.setText("Select all") + self.selectAll.setText("Select &All") self.selectAllState=not self.selectAllState def connectActions(self): self.actionQuit.triggered.connect(app.quit) + self.quit.clicked.connect(app.quit) self.actionRename.triggered.connect(self.rename) self.actionUpdate.triggered.connect(self.updateList) + self.actionCheck.triggered.connect(self.manualChecks) self.actionPreferences.triggered.connect(self.prefs) self.syncGo.clicked.connect(self.launchSync) self.selectAll.clicked.connect(self.selectAllIsos) @@ -329,6 +349,9 @@ class IsosViewer(QMainWindow, mageiaSyncUI.Ui_mainWindow): self.fillList.setup(self.nameWithPath, self.password,self.destination) self.fillList.endSignal.connect(self.closeFill) self.fillList.start() + # Reset the button + self.selectAll.setText("Select &All") + self.selectAllState=True def lvMessage( self,message): # Add a line in the logview diff --git a/share/icons/mageiasync.png b/share/icons/mageiasync.png Binary files differnew file mode 100644 index 0000000..00e30f4 --- /dev/null +++ b/share/icons/mageiasync.png diff --git a/share/icons/mageiasync.svg b/share/icons/mageiasync.svg index e12be99..88c3cfd 100644 --- a/share/icons/mageiasync.svg +++ b/share/icons/mageiasync.svg @@ -11,12 +11,15 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2" - sodipodi:docname="optical_disc_schema.svg" - viewBox="0 0 700 700" + sodipodi:docname="mageiasync.svg" + viewBox="0 0 885.82675 885.82675" version="1.1" inkscape:version="0.48.4 r9939" width="100%" - height="100%"> + height="100%" + inkscape:export-filename="/home/yves/Documents/git/mageiaSync/share/icons/mageiasync.png" + inkscape:export-xdpi="3.2408426" + inkscape:export-ydpi="3.2408426"> <sodipodi:namedview id="base" bordercolor="#666666" @@ -30,20 +33,26 @@ showgrid="false" borderopacity="1.0" inkscape:current-layer="layer1" - inkscape:cx="414.78574" - inkscape:cy="89.799241" + inkscape:cx="432.01869" + inkscape:cy="504.24716" showguides="true" inkscape:window-y="-3" inkscape:window-width="1280" inkscape:pageopacity="0.0" - inkscape:document-units="px"> + inkscape:document-units="px" + units="cm" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + width="25cm"> <sodipodi:guide orientation="1,0" - position="349.50803,147.48024" + position="342.46243,148.38361" id="guide2824" /> <sodipodi:guide orientation="0,1" - position="307.08162,349.51075" + position="300.03602,350.41412" id="guide2826" /> </sodipodi:namedview> <defs @@ -65,141 +74,149 @@ </linearGradient> <linearGradient inkscape:collect="always" - x1="487.42" - y1="557.91" - gradientTransform="matrix(-1.0585 -.88822 .88822 -1.0585 324.65 1328.4)" - x2="507.26" + x1="487.42001" + y1="557.90997" + gradientTransform="matrix(-0.90376776,-0.75837941,0.75837941,-0.90376776,398.84627,966.36787)" + x2="507.26001" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient2947" - y2="486.68" + y2="486.67999" id="linearGradient2974" /> <linearGradient inkscape:collect="always" - x1="487.42" - y1="557.91" - gradientTransform="matrix(-1.0585 .88822 -.88822 -1.0585 1189.2 675.25)" - x2="507.26" + x1="487.42001" + y1="557.90997" + gradientTransform="matrix(-0.90376776,0.75837941,-0.75837941,-0.90376776,1137.0157,408.69577)" + x2="507.26001" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient2947" - y2="486.68" + y2="486.67999" id="linearGradient2979" /> <linearGradient inkscape:collect="always" - x1="487.42" - y1="557.91" - gradientTransform="matrix(1.0585 .88822 -.88822 1.0585 410.74 -355.07)" - x2="507.26" + x1="487.42001" + y1="557.90997" + gradientTransform="matrix(0.90376776,0.75837941,-0.75837941,0.90376776,472.35157,-471.01137)" + x2="507.26001" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient2947" - y2="486.68" + y2="486.67999" id="linearGradient2983" /> <linearGradient inkscape:collect="always" - x1="487.42" - y1="557.91" - gradientTransform="matrix(1.0585 -.88822 .88822 1.0585 -453.8 298.12)" - x2="507.26" + x1="487.42001" + y1="557.90997" + gradientTransform="matrix(0.90376776,-0.75837941,0.75837941,0.90376776,-265.80939,86.694886)" + x2="507.26001" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient2947" - y2="486.68" + y2="486.67999" id="linearGradient2987" /> </defs> <g - transform="translate(-18.188 -136.19)" + transform="translate(-25.233596,48.732985)" inkscape:groupmode="layer" inkscape:label="Layer 1" id="layer1"> <path - d="m -70.121766,505.51829 c -8.30856,0 -15.295518,6.44144 -15.295518,14.1013 v 70.95922 c -0.0158,0.36393 -0.494221,0.55316 -0.494221,0.91709 v 538.6064 c 0,12.8683 11.210713,23.2038 25.165689,23.2038 H 527.91161 c 13.95812,0 25.16885,-10.3355 25.16885,-23.2038 V 591.4959 c 0,-12.86834 -11.21073,-23.20375 -25.16885,-23.20375 H 295.50238 v -48.67256 c 0,-7.65986 -6.97907,-14.1013 -15.28446,-14.1013 H -70.124917 z" - style="fill:#000080;fill-rule:evenodd;stroke:#333333;stroke-width:47.37753677000000607;stroke-linejoin:round" + d="m 61.782496,263.77555 c -7.094009,0 -13.059609,5.49983 -13.059609,12.03997 v 60.58635 c -0.01349,0.31073 -0.421975,0.4723 -0.421975,0.78303 v 459.87256 c 0,10.9872 9.571923,19.81185 21.486952,19.81185 H 572.39496 c 11.91771,0 21.48965,-8.82465 21.48965,-19.81185 V 337.1849 c 0,-10.98724 -9.57194,-19.81181 -21.48965,-19.81181 h -198.4355 v -41.55757 c 0,-6.54014 -5.95886,-12.03997 -13.05016,-12.03997 H 61.779806 z" + style="fill:#000080;fill-rule:evenodd;stroke:#333333;stroke-width:40.45185852;stroke-linejoin:round" id="path938" inkscape:connector-curvature="0" /> <path - d="m368.19 136.19c-193.3 0-350 156.7-350 350s156.7 350 350 350 350-156.7 350-350-156.7-350-350-350zm0 244.47c58.29 0 105.53 47.241 105.53 105.53 0 58.29-47.241 105.53-105.53 105.53-58.29 0-105.56-47.241-105.56-105.53 0-58.29 47.273-105.53 105.56-105.53z" + d="m 436.02156,-51.56408 c -165.04328,0 -298.83677,133.793491 -298.83677,298.83677 0,165.04327 133.79349,298.83676 298.83677,298.83676 165.04328,0 298.83677,-133.79349 298.83677,-298.83676 0,-165.043279 -133.79349,-298.83677 -298.83677,-298.83677 z m 0,208.73321 c 49.76913,0 90.10355,40.33528 90.10355,90.10356 0,49.76913 -40.33527,90.10355 -90.10355,90.10355 -49.76913,0 -90.12917,-40.33528 -90.12917,-90.10355 0,-49.76913 40.3626,-90.10356 90.12917,-90.10356 z" style="fill:#000000" - id="path2816" /> + id="path2816" + inkscape:connector-curvature="0" /> <path - d="m363.91 156.41c-180.18 2.28-325.54 149.06-325.54 329.78 0.005 182.14 147.68 329.81 329.82 329.81s329.78-147.67 329.78-329.81-147.64-329.78-329.78-329.78c-1.423 0-2.8625-0.018-4.2812 0zm4.2812 224.25c58.29 0 105.53 47.241 105.53 105.53 0 58.29-47.241 105.53-105.53 105.53-58.29 0-105.56-47.241-105.56-105.53 0-58.29 47.273-105.53 105.56-105.53z" + d="M 432.36721,-34.299853 C 278.52605,-32.353145 154.41487,92.970458 154.41487,247.27269 c 0.004,155.51465 126.09204,281.59815 281.60669,281.59815 155.51465,0 281.57254,-126.0835 281.57254,-281.59815 0,-155.514655 -126.05789,-281.572543 -281.57254,-281.572543 -1.21498,0 -2.44406,-0.01537 -3.65537,0 z m 3.65537,191.468983 c 49.76913,0 90.10356,40.33528 90.10356,90.10356 0,49.76913 -40.33528,90.10355 -90.10356,90.10355 -49.76912,0 -90.12916,-40.33528 -90.12916,-90.10355 0,-49.76913 40.3626,-90.10356 90.12916,-90.10356 z" style="fill:#808080" - id="path2818" /> + id="path2818" + inkscape:connector-curvature="0" /> <path - d="m41.853 544.14c10.086 57.198 35.038 110.74 72.372 155.24l172.99-145.15c-0.10804-0.12766-0.21374-0.25482-0.3214-0.38301-12.204-14.544-19.792-31.424-22.964-48.856l-222.07 39.15z" + d="m 157.38872,296.75152 c 8.61162,48.83676 29.91612,94.55195 61.79261,132.54691 L 366.88354,305.36655 c -0.0922,-0.10899 -0.1825,-0.21757 -0.27442,-0.32702 -10.42001,-12.41795 -16.89879,-26.83042 -19.60711,-41.71419 l -189.60765,33.42702 z" style="fill:url(#linearGradient2979)" - inkscape:transform-center-y="115.49304" - inkscape:transform-center-x="203.16584" - id="path2977" /> + inkscape:transform-center-y="98.610193" + inkscape:transform-center-x="173.46692" + id="path2977" + inkscape:connector-curvature="0" /> <path - d="m480.86 797.6c54.57-19.86 102.97-53.73 140.31-98.22l-172.99-145.15c-0.10696 0.12857-0.21383 0.25474-0.32138 0.38303-12.204 14.544-27.51 24.948-44.126 31.099l77.12 211.9z" - inkscape:transform-center-y="189.2272" + d="m 532.22138,513.16057 c 46.59293,-16.95686 87.91778,-45.87572 119.79939,-83.86214 L 504.31857,305.36655 c -0.0913,0.10978 -0.18257,0.21751 -0.2744,0.32704 -10.42001,12.41795 -23.48857,21.30109 -37.67563,26.55293 l 65.84654,180.92432 z" + inkscape:transform-center-y="161.56584" style="fill:url(#linearGradient2983)" - inkscape:transform-center-x="-144.75597" - id="path2981" /> + inkscape:transform-center-x="-123.59545" + id="path2981" + inkscape:connector-curvature="0" /> <path - d="m693.54 429.24c-10.09-57.2-35.04-110.75-72.37-155.24l-172.99 145.15c0.10804 0.12767 0.21373 0.25482 0.3214 0.38301 12.204 14.544 19.792 31.424 22.964 48.856l222.07-39.153z" + d="M 713.81168,198.64768 C 705.19664,149.80921 683.89385,104.08719 652.02077,66.100764 L 504.31857,190.03264 c 0.0922,0.10901 0.18249,0.21757 0.27442,0.32702 10.42001,12.41795 16.89879,26.83042 19.6071,41.7142 l 189.60766,-33.42959 z" style="fill:url(#linearGradient2987)" - inkscape:transform-center-y="-115.49304" - inkscape:transform-center-x="-203.16584" - id="path2985" /> + inkscape:transform-center-y="-98.610189" + inkscape:transform-center-x="-173.46692" + id="path2985" + inkscape:connector-curvature="0" /> <path - d="m254.53 175.77c-54.578 19.865-102.98 53.736-140.31 98.229l172.98 145.15c0.10695-0.12857 0.21383-0.25475 0.32138-0.38303 12.204-14.544 27.51-24.948 44.126-31.099l-77.12-211.9z" - inkscape:transform-center-y="-189.2272" + d="M 338.97645,-17.769911 C 292.3767,-0.80878964 251.05014,28.110925 219.17706,66.09991 l 147.69367,123.93188 c 0.0913,-0.10978 0.18257,-0.21751 0.2744,-0.32704 10.42001,-12.41795 23.48857,-21.30109 37.67563,-26.55293 L 338.97422,-17.772498 z" + inkscape:transform-center-y="-161.56584" style="fill:url(#linearGradient2974)" - inkscape:transform-center-x="144.75597" - id="path2943" /> + inkscape:transform-center-x="123.59545" + id="path2943" + inkscape:connector-curvature="0" /> <path - d="m368.19 362.47c-68.332 0-123.72 55.387-123.72 123.72 0 68.332 55.387 123.72 123.72 123.72 68.332 0 123.72-55.387 123.72-123.72 0-68.332-55.387-123.72-123.72-123.72zm0 18.188c58.29 0 105.53 47.241 105.53 105.53 0 58.29-47.241 105.53-105.53 105.53-58.29 0-105.56-47.241-105.56-105.53 0-58.29 47.273-105.53 105.56-105.53z" + d="m 436.02156,141.63816 c -58.34318,0 -105.63453,47.29049 -105.63453,105.63453 0,58.34318 47.29049,105.63452 105.63453,105.63452 58.34318,0 105.63453,-47.29049 105.63453,-105.63452 0,-58.34318 -47.29049,-105.63453 -105.63453,-105.63453 z m 0,15.52927 c 49.76913,0 90.10355,40.33528 90.10355,90.10355 0,49.76913 -40.33527,90.10355 -90.10355,90.10355 -49.76913,0 -90.12917,-40.33528 -90.12917,-90.10355 0,-49.76913 40.3626,-90.10355 90.12917,-90.10355 z" style="fill:#000000" - id="path2820" /> + id="path2820" + inkscape:connector-curvature="0" /> <path - d="m364.41 194.78c-159.21 2.02-287.66 131.72-287.66 291.41 0 160.94 130.5 291.44 291.44 291.44s291.41-130.5 291.41-291.44-130.46-291.41-291.41-291.41c-1.2574 0-2.5277-0.0159-3.7812 0zm3.7812 169.12c67.547 0 122.28 54.734 122.28 122.28 0 67.547-54.734 122.31-122.28 122.31-67.547 0-122.31-54.766-122.31-122.31 0-67.547 54.766-122.28 122.31-122.28z" - style="opacity:.2;fill:#999999" - id="path2865" /> + d="M 432.79412,-1.5388052 C 296.85755,0.18590988 187.18445,110.92628 187.18445,247.27269 c 0,137.41368 111.42343,248.8371 248.83711,248.8371 137.41368,0 248.81149,-111.42342 248.81149,-248.8371 0,-137.41369 -111.38927,-248.8114952 -248.81149,-248.8114952 -1.07359,0 -2.1582,-0.013576 -3.22846,0 z m 3.22846,144.3979252 c 57.67294,0 104.40503,46.73295 104.40503,104.40503 0,57.67293 -46.73294,104.43064 -104.40503,104.43064 -57.67293,0 -104.43064,-46.76027 -104.43064,-104.43064 0,-57.67293 46.76027,-104.40503 104.43064,-104.40503 z" + style="opacity:0.2;fill:#999999" + id="path2865" + inkscape:connector-curvature="0" /> <path - d="m364.97 239.25c-134.92 1.709-243.75 111.61-243.75 246.94 0 136.39 110.57 246.97 246.97 246.97 136.39 0 246.94-110.57 246.94-246.97 0-136.39-110.54-246.94-246.94-246.94-1.0656 0-2.1564-0.0135-3.2188 0zm3.2188 124.66c67.547 0 122.28 54.734 122.28 122.28 0 67.547-54.734 122.31-122.28 122.31-67.547 0-122.31-54.766-122.31-122.31 0-67.547 54.766-122.28 122.31-122.28z" - style="opacity:.2;fill:#999999" - id="path2867" /> + d="M 433.27226,36.430541 C 318.07496,37.88972 225.1538,131.72532 225.1538,247.27269 c 0,116.45242 94.4068,210.86776 210.86776,210.86776 116.45242,0 210.84215,-94.40681 210.84215,-210.86776 0,-116.45242 -94.38119,-210.842149 -210.84215,-210.842149 -0.90983,0 -1.84118,-0.01153 -2.74827,0 z m 2.74828,106.437119 c 57.67293,0 104.40502,46.73295 104.40502,104.40503 0,57.67293 -46.73294,104.43064 -104.40502,104.43064 -57.67294,0 -104.43065,-46.76027 -104.43065,-104.43064 0,-57.67294 46.76027,-104.40503 104.43065,-104.40503 z" + style="opacity:0.2;fill:#999999" + id="path2867" + inkscape:connector-curvature="0" /> <path - d="m365.72 295.81c-104.02 1.3176-187.94 86.044-187.94 190.38 0 105.15 85.254 190.41 190.41 190.41 105.15 0 190.38-85.254 190.38-190.41 0-105.15-85.222-190.38-190.38-190.38-0.82149 0-1.6497-0.0104-2.4688 0zm2.4688 68.094c67.547 0 122.28 54.734 122.28 122.28 0 67.547-54.734 122.31-122.28 122.31-67.547 0-122.31-54.766-122.31-122.31 0-67.547 54.766-122.28 122.31-122.28z" - style="opacity:.2;fill:#999999" - id="path2869" /> + d="m 433.91263,84.722564 c -88.81429,1.124992 -160.46681,73.466026 -160.46681,162.550126 0,89.7791 72.79151,162.57574 162.57574,162.57574 89.7791,0 162.55012,-72.79152 162.55012,-162.57574 0,-89.7791 -72.76419,-162.550126 -162.55012,-162.550126 -0.7014,0 -1.40855,-0.0089 -2.10791,0 z m 2.10791,58.139976 c 57.67293,0 104.40502,46.73294 104.40502,104.40502 0,57.67294 -46.73294,104.43065 -104.40502,104.43065 -57.67294,0 -104.43065,-46.76027 -104.43065,-104.43065 0,-57.67293 46.76027,-104.40502 104.43065,-104.40502 z" + style="opacity:0.2;fill:#999999" + id="path2869" + inkscape:connector-curvature="0" /> <path - d="m366.31 342.28c-78.63 1-142.06 65.04-142.06 143.91 0 79.49 64.448 143.94 143.94 143.94 79.49 0 143.91-64.448 143.91-143.94 0-79.49-64.417-143.91-143.91-143.91-0.621 0-1.2558-0.008-1.875 0zm1.875 21.625c67.547 0 122.28 54.734 122.28 122.28 0 67.547-54.734 122.31-122.28 122.31-67.547 0-122.31-54.766-122.31-122.31 0-67.547 54.766-122.28 122.31-122.28z" - style="opacity:.2;fill:#999999" - id="path2871" /> + d="m 434.41638,124.39955 c -67.13581,0.85382 -121.29357,55.53241 -121.29357,122.87314 0,67.8701 55.02694,122.89875 122.89875,122.89875 67.8701,0 122.87314,-55.02695 122.87314,-122.89875 0,-67.8701 -55.00048,-122.87314 -122.87314,-122.87314 -0.53022,0 -1.07223,-0.007 -1.60091,0 z m 1.60091,18.46384 c 57.67294,0 104.40503,46.73295 104.40503,104.40503 0,57.67293 -46.73295,104.43064 -104.40503,104.43064 -57.67293,0 -104.43064,-46.76027 -104.43064,-104.43064 0,-57.67294 46.76027,-104.40503 104.43064,-104.40503 z" + style="opacity:0.2;fill:#999999" + id="path2871" + inkscape:connector-curvature="0" /> <rect sodipodi:fill-cmyk="(0 0 0 0.5)" - height="549.09943" - x="333.0416" - y="678.41187" + height="468.8317" + x="344.01242" + y="400.31091" sodipodi:stroke-cmyk="(0 0 0 0.8)" - width="640.13489" + width="546.55957" transform="matrix(1,0,-0.34649668,0.9380512,0,0)" - rx="25.229942" - style="fill:#7f7f7f;fill-rule:evenodd;stroke:#333333;stroke-width:52.12572479;stroke-linejoin:round" + rx="21.541813" + style="fill:#7f7f7f;fill-rule:evenodd;stroke:#333333;stroke-width:44.50595093;stroke-linejoin:round" id="rect922" /> <path - d="M 600.62781,821.48442 270.89943,1022.436 99.108663,826.28429 600.62781,821.48442 z" - style="fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:31.0745163;stroke-linecap:round;stroke-linejoin:round" + d="M 634.48146,533.55354 352.95299,705.12989 206.27471,537.65177 634.48146,533.55354 z" + style="fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:26.53202248;stroke-linecap:round;stroke-linejoin:round" sodipodi:nodetypes="cccc" id="path834" inkscape:connector-curvature="0" /> <path style="fill:#dbe2e3" - d="m -80.045073,672.05066 c -0.07028,-101.56204 0.353646,-205.53491 0.942058,-231.05082 l 1.069839,-46.39256 39.981622,0 39.9816195,0 1.9988493,12.54392 c 5.0549063,31.72243 16.7724422,67.93757 31.5732552,97.58279 l 8.516935,17.05896 -61.264215,165.83942 c -33.695318,91.21168 -61.581007,166.56776 -61.968197,167.45798 -0.387191,0.89021 -0.761486,-81.47765 -0.831766,-183.03969 z" + d="m 68.839051,522.24577 c -0.06001,-86.71564 0.30195,-175.48968 0.804347,-197.27566 l 0.913449,-39.61087 34.137083,0 34.13708,0 1.70666,10.71025 c 4.31598,27.08522 14.32063,58.00641 26.95786,83.31807 l 7.27191,14.56527 -52.30856,141.5969 C 93.689162,613.42803 69.879819,677.76851 69.549229,678.52859 69.218638,679.28867 68.899057,608.9614 68.839051,522.24577 z" id="path3335" - inkscape:connector-curvature="0" - transform="translate(18.188,136.19)" /> + inkscape:connector-curvature="0" /> <path style="fill:#2383c2" - d="m -78.545911,637.25785 c 0.0046,-116.09865 0.478637,-218.18994 1.053403,-226.86951 l 1.045029,-15.78106 38.570716,0 38.5707171,0 0.7811848,3.64178 c 0.429651,2.00298 1.9591637,9.83281 3.398917,17.39963 5.5795331,29.32397 15.0510451,57.63174 29.2695291,87.47864 L 43.046869,521.81677 -17.024,684.35184 c -33.038979,89.39428 -60.399238,162.86342 -60.800577,163.26476 -0.401339,0.40134 -0.72594,-94.26011 -0.721334,-210.35875 z" + d="m 70.119064,492.53899 c 0.0039,-99.12727 0.40867,-186.29479 0.899416,-193.70557 l 0.892266,-13.47418 32.932424,0 32.93242,0 0.667,3.10943 c 0.36684,1.71018 1.67277,8.39544 2.90205,14.85614 4.76392,25.03737 12.85088,49.20709 24.99089,74.69095 l 7.60181,15.95741 -51.28967,138.77558 c -28.209324,76.32657 -51.570046,139.05594 -51.912717,139.39861 -0.342671,0.34267 -0.619821,-80.4811 -0.615889,-179.60837 z" id="path3337" - inkscape:connector-curvature="0" - transform="translate(18.188,136.19)" /> + inkscape:connector-curvature="0" /> <path - transform="translate(18.188,136.19)" inkscape:connector-curvature="0" id="path3399" - d="m 186.10585,785.17147 -69.12268,-78.98953 28.07506,-0.34072 c 116.75054,-1.4169 375.81087,-3.69261 376.19877,-3.30471 0.59277,0.59278 -261.42356,160.45676 -264.1005,161.13559 -1.06038,0.26889 -33.03318,-35.05639 -71.05065,-78.50063 z" + d="m 296.08386,618.8305 -59.01828,-67.44279 23.97103,-0.29091 c 99.68387,-1.20978 320.87458,-3.15282 321.20578,-2.82163 0.50612,0.50613 -223.20849,137.00109 -225.49411,137.58069 -0.90538,0.22959 -28.20437,-29.93183 -60.66442,-67.02536 z" style="fill:#3494d3" /> </g> <metadata |
