Skip to content

Commit

Permalink
v0.9.9.9.4.1b
Browse files Browse the repository at this point in the history
  • Loading branch information
@XRoemer
XRoemer committed Apr 3, 2016
1 parent 1afdcdb commit 0bc6b61
Show file tree
Hide file tree
Showing 8 changed files with 118 additions and 89 deletions.
Binary file modified organon.oxt
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion source/description.xml
View file
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:l="http://libreoffice.org/extensions/description/2011">
<identifier value="xaver.roemers.organon" />
<version value="0.9.9.9.4b" />
<version value="0.9.9.9.4.1b" />

<dependencies>
<d:OpenOffice.org-minimal-version value="3.4" d:name="OpenOffice.org 3.4" />
Expand Down
34 changes: 16 additions & 18 deletions source/py/einstellungen.py
View file
Expand Up @@ -1507,10 +1507,10 @@ def kategorien_uebernehmen(self,sel_row):
for nr,ctrls in self.rows.items():

reihen.update( {nr: {
'name' : ctrls['name'].Text,
'breite' : ctrls['breite'].Text,
'typ' : ctrls['typ'].Text,
'original' : ctrls['original']
'name' : ctrls['name'].Text,
'breite' : ctrls['breite'].Text,
'typ' : ctrls['typ'].Text,
'original' : ctrls['original']

}})

Expand Down Expand Up @@ -1556,21 +1556,19 @@ def kategorien_uebernehmen(self,sel_row):

if art == 'tag':
tags2['sammlung'][nr] = []

for ordi in tags2['ordinale']:
if art == 'txt':
tags2['ordinale'][ordi][nr] = ''
elif art == 'tag':
tags2['ordinale'][ordi][nr] = []
elif art == 'date':
tags2['ordinale'][ordi][nr] = None
elif art == 'time':
tags2['ordinale'][ordi][nr] = None
elif art == 'img':
tags2['ordinale'][ordi][nr] = ''

if art == 'txt':
eintrag = ''
elif art == 'tag':
eintrag = []
elif art == 'date':
eintrag = None
elif art == 'time':
eintrag = None
elif art == 'img':
eintrag = ''

for ordi in tags2['ordinale']:
tags2['ordinale'][ordi][nr] = eintrag


# auf gueltige Eintraege ueberpruefen
for nr,b in tags2['nr_breite'].items():
Expand Down
116 changes: 82 additions & 34 deletions source/py/funktionen.py
View file
Expand Up @@ -4,14 +4,80 @@
from math import sqrt
from shutil import copyfile
import json
from collections import OrderedDict

class Funktionen():

def __init__(self,mb):
if mb.debug: log(inspect.stack)
self.mb = mb

self.mb = mb

items = OrderedDict((
('leer' , LANG.LEER),
('blau' , LANG.BLAU),
('braun' , LANG.BRAUN),
('creme' , LANG.CREME),
('gelb' , LANG.GELB),
('grau' , LANG.GRAU),
('gruen' , LANG.GRUEN),
('hellblau' , LANG.HELLBLAU),
('hellgrau' , LANG.HELLGRAU),
('lila' , LANG.LILA),
('ocker' , LANG.OCKER),
('orange' , LANG.ORANGE),
('pink' , LANG.PINK),
('rostrot' , LANG.ROSTROT),
('rot' , LANG.ROT),
('schwarz' , LANG.SCHWARZ),
('tuerkis' , LANG.TUERKIS),
('weiss' , LANG.WEISS)
))

self.items = OrderedDict( ( v , k ) for k,v in items.items() )

self.color_items = ('leer',
'blau',
'braun',
'creme',
'gelb',
'grau',
'gruen',
'hellblau',
'hellgrau',
'lila',
'ocker',
'orange',
'pink',
'rostrot',
'rot',
'schwarz',
'tuerkis',
'weiss')


self.color_items = ('leer',
'creme',
'gelb',
'gruen',
'tuerkis',
'hellblau',
'blau',
'orange',
'ocker',
'rot',
'pink',
'lila',
'rostrot',
'braun',
'weiss',
'hellgrau',
'grau',
'schwarz',
)

self.items = OrderedDict( ( items[k] , k ) for k in self.color_items )


def projektordner_ausklappen(self, ordinal=None, selektiere_zeile=True,ist_papierkorb=False):
if self.mb.debug: log(inspect.stack)

Expand Down Expand Up @@ -131,39 +197,20 @@ def erzeuge_ListBox_Tag1(self,window,cont,ord_source,window_parent):
model.Border = 0
model.BackgroundColor = KONST.FARBE_HF_HINTERGRUND

items = ('leer',
'blau',
'braun',
'creme',
'gelb',
'grau',
'gruen',
'hellblau',
'hellgrau',
'lila',
'ocker',
'orange',
'pink',
'rostrot',
'rot',
'schwarz',
'tuerkis',
'weiss')
try:
control.addItems(tuple(self.items.keys()), 0)

for pos,item in enumerate(self.color_items):
model.setItemImage(pos, KONST.URL_IMGS + 'punkt_%s.png' %item)

tag_item_listener = Tag1_Item_Listener(self.mb,window,ord_source)
tag_item_listener.window_parent = window_parent

control.addItems(items, 0)

for item in items:
pos = items.index(item)
model.setItemImage(pos,KONST.URL_IMGS+'punkt_%s.png' %item)


tag_item_listener = Tag1_Item_Listener(self.mb,window,ord_source)
tag_item_listener.window_parent = window_parent
control.addItemListener(tag_item_listener)

control.addItemListener(tag_item_listener)

cont.addControl('Eintraege_Tag1', control)

cont.addControl('Eintraege_Tag1', control)
except:
log(inspect.stack,tb())


def erzeuge_Tag2_Container(self,ordinal,X,Y,window_parent=None):
Expand Down Expand Up @@ -2059,7 +2106,8 @@ def itemStateChanged(self, ev):

try:
sel = ev.value.Source.Items[ev.value.Selected]

sel = self.mb.class_Funktionen.items[sel]

# image tag1 aendern
src = self.mb.props[T.AB].Hauptfeld.getControl(self.ord_source).getControl('tag1')
if src != None:
Expand Down
27 changes: 3 additions & 24 deletions source/py/organizer.py
View file
Expand Up @@ -28,29 +28,8 @@ def __init__(self,mb):
self.first_time_info = True
self.rangex = None
self.bilder_reihe = {}

# Die Color items sollten mal uebersetzt werden!
self.color_items = (
'blau',
'braun',
'creme',
'gelb',
'grau',
'gruen',
'hellblau',
'hellgrau',
'lila',
'ocker',
'orange',
'pink',
'rostrot',
'rot',
'schwarz',
'tuerkis',
'weiss')





def run(self):
if self.mb.debug: log(inspect.stack)

Expand Down Expand Up @@ -526,7 +505,7 @@ def erzeuge_img_button(self,pos,btn_name,url):

oButton = self.mb.createUnoService("com.sun.star.form.component.ImageButton")

if url in self.color_items:
if url in self.mb.class_Funktionen.color_items:
pfad = self.mb.path_to_extension
url = uno.systemPathToFileUrl(os.path.join(pfad,'img','punkt_%s.png' %url))
elif url == 'leer':
Expand Down
2 changes: 1 addition & 1 deletion source/py/projects.py
View file
Expand Up @@ -1175,7 +1175,7 @@ def test(self):

suche = self.mb.class_Suche


tags = self.mb.tags


#attr = self.mb.class_Tools.ueberpruefe_LANG()
Expand Down
15 changes: 13 additions & 2 deletions source/py/suche.py
View file
Expand Up @@ -1077,23 +1077,25 @@ def funde_taggen(self, ordis, funde, ctrls):
for z in zu_loeschende:
del ergebnisse[z]



for panel_nr,[ordis,new_tag] in vorhandene.items():
for o in ordis:
if new_tag not in tags['ordinale'][o][panel_nr]:
tags['ordinale'][o][panel_nr].append(new_tag)


kategorie = ctrls['kat_auswahl'].SelectedItem
panel_nr = tags['name_nr'][kategorie]

for new_tag, ordis in ergebnisse.items():
for o in ordis:
print(o)
if new_tag not in tags['ordinale'][o][panel_nr]:
tags['ordinale'][o][panel_nr].append(new_tag)
if new_tag not in tags['sammlung'][panel_nr]:
tags['sammlung'][panel_nr].append(new_tag)


Popup(self.mb, 'info').text = LANG.FUNDE_WURDEN_GETAGGT

except:
Expand Down Expand Up @@ -1433,6 +1435,15 @@ def collapse_expand_panels(self, name, source):

try:
dict_suche = self.mb.class_Suche.dict_suche

url_collapse = self.mb.class_Suche.url_collapse
url_expand = self.mb.class_Suche.url_expand

if source.Model.ImageURL == url_collapse:
source.Model.ImageURL = url_expand
else:
source.Model.ImageURL = url_collapse


if name == 'Suchen':
panels = (dict_suche['Bearbeiten'], dict_suche['Ergebnisse'])
Expand Down
11 changes: 2 additions & 9 deletions source/py/tabs.py
View file
Expand Up @@ -1527,18 +1527,12 @@ def erzeuge_props(self,tab_name):

def erzeuge_Eintraege(self,tab_name,ordinale):
if self.mb.debug: log(inspect.stack)

# hier sollen die Ergebnisse von Suche oder Tags erzeugt werden

# parent_eintrag = ('nr0','root',self.mb.projekt_name,0,'prj','auf','ja','leer','leer','leer')
# papierkorb = ('nr5','root',LANG.PAPIERKORB,0,'waste','zu','ja','leer','leer','leer')


xml_tree = self.mb.props['ORGANON'].xml_tree
root = xml_tree.getroot()

Eintraege = []


# Ordinal des Projekts muss enthalten sein und an erster Stelle stehen
if self.prj_ord not in ordinale:
ordinale.insert(0,self.prj_ord)
Expand All @@ -1560,7 +1554,7 @@ def erzeuge_Eintraege(self,tab_name,ordinale):
lvl = 1
parent = self.prj_ord
else:
lvl = 0 #elem.attrib['Lvl']
lvl = 0
parent = 'root'
zustand = elem.attrib['Zustand']
sicht = 'ja'
Expand Down Expand Up @@ -1737,7 +1731,6 @@ def erzeuge_Eintraege_und_Bereiche(self,Eintraege,tab_name):
props.dict_posY_ctrl.update({ pos_Y : ctrl })

# Bereiche
inhalt = name
path = os.path.join(self.mb.pfade['odts'],ordinal+'.odt')

Bereichsname_dict.update({'OrganonSec'+str(index2):path})
Expand Down

0 comments on commit 0bc6b61

Please sign in to comment.