Skip to content

Commit 919a773

Browse files
witheriawitheria
committed
First Official Version 0.1.1 ClosedAlpha
1 parent 35eec83 commit 919a773

File tree

7 files changed

+674
-57
lines changed

7 files changed

+674
-57
lines changed

‎resources/CHANGELOG.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Added:
2222
- All other buttons NOT mentioned dont do anything yet - wait for next update!
2323

2424
- Cleaned up directory
25-
- Added .oi file ending
25+
- Added .oi file ending (for saved configs)
2626

2727
in 0.1.a (Hotfix)
2828
- Basic log functionality (Don't expect anything)

‎resources/SelectionDialog.ui‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>Dialog</class>
4+
<widget class="QDialog" name="Dialog">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>269</width>
10+
<height>165</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<widget class="QDialogButtonBox" name="buttonBox">
17+
<property name="geometry">
18+
<rect>
19+
<x>-120</x>
20+
<y>130</y>
21+
<width>341</width>
22+
<height>30</height>
23+
</rect>
24+
</property>
25+
<property name="orientation">
26+
<enum>Qt::Horizontal</enum>
27+
</property>
28+
<property name="standardButtons">
29+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
30+
</property>
31+
</widget>
32+
<widget class="QLabel" name="label">
33+
<property name="geometry">
34+
<rect>
35+
<x>10</x>
36+
<y>10</y>
37+
<width>311</width>
38+
<height>16</height>
39+
</rect>
40+
</property>
41+
<property name="font">
42+
<font>
43+
<pointsize>9</pointsize>
44+
</font>
45+
</property>
46+
<property name="text">
47+
<string>What kind of item would you like to create?</string>
48+
</property>
49+
</widget>
50+
<widget class="QComboBox" name="select">
51+
<property name="geometry">
52+
<rect>
53+
<x>10</x>
54+
<y>40</y>
55+
<width>241</width>
56+
<height>22</height>
57+
</rect>
58+
</property>
59+
<item>
60+
<property name="text">
61+
<string>Text only</string>
62+
</property>
63+
</item>
64+
<item>
65+
<property name="text">
66+
<string>Only numbers</string>
67+
</property>
68+
</item>
69+
<item>
70+
<property name="text">
71+
<string>Select Text</string>
72+
</property>
73+
</item>
74+
<item>
75+
<property name="text">
76+
<string>Chronos</string>
77+
</property>
78+
</item>
79+
</widget>
80+
<widget class="QLabel" name="label_2">
81+
<property name="geometry">
82+
<rect>
83+
<x>10</x>
84+
<y>70</y>
85+
<width>311</width>
86+
<height>16</height>
87+
</rect>
88+
</property>
89+
<property name="font">
90+
<font>
91+
<pointsize>9</pointsize>
92+
</font>
93+
</property>
94+
<property name="text">
95+
<string>What should be the name of the item?</string>
96+
</property>
97+
</widget>
98+
<widget class="QLineEdit" name="name">
99+
<property name="geometry">
100+
<rect>
101+
<x>10</x>
102+
<y>100</y>
103+
<width>241</width>
104+
<height>20</height>
105+
</rect>
106+
</property>
107+
</widget>
108+
</widget>
109+
<resources/>
110+
<connections>
111+
<connection>
112+
<sender>buttonBox</sender>
113+
<signal>accepted()</signal>
114+
<receiver>Dialog</receiver>
115+
<slot>accept()</slot>
116+
<hints>
117+
<hint type="sourcelabel">
118+
<x>165</x>
119+
<y>152</y>
120+
</hint>
121+
<hint type="destinationlabel">
122+
<x>245</x>
123+
<y>141</y>
124+
</hint>
125+
</hints>
126+
</connection>
127+
<connection>
128+
<sender>buttonBox</sender>
129+
<signal>rejected()</signal>
130+
<receiver>Dialog</receiver>
131+
<slot>reject()</slot>
132+
<hints>
133+
<hint type="sourcelabel">
134+
<x>90</x>
135+
<y>147</y>
136+
</hint>
137+
<hint type="destinationlabel">
138+
<x>244</x>
139+
<y>148</y>
140+
</hint>
141+
</hints>
142+
</connection>
143+
</connections>
144+
</ui>

‎resources/TextFileWidget.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<rect>
9898
<x>4</x>
9999
<y>20</y>
100-
<width>261</width>
100+
<width>263</width>
101101
<height>20</height>
102102
</rect>
103103
</property>
@@ -147,7 +147,7 @@
147147
<widget class="QPushButton" name="deleteFromItem">
148148
<property name="geometry">
149149
<rect>
150-
<x>200</x>
150+
<x>197</x>
151151
<y>50</y>
152152
<width>71</width>
153153
<height>21</height>

‎resources/__init__.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,18 @@ def is_admin():
3030

3131

3232
class uiControlTest(QMainWindow):
33-
"""uncomment this to output a logfile"""
3433

35-
# old_stdout = sys.stdout
36-
# log_file = open("message.log", "w")
37-
# sys.stdout = log_file
3834
if is_admin():
3935
def __init__(self):
4036
super(uiControlTest, self).__init__()
4137

4238
# Basic loading and startup operations
4339

44-
self.ui = uic.loadUi('main.ui')
40+
self.ui = uic.loadUi('mainALPHA.ui')
4541
window = self.ui
4642
window.setWindowIcon(QIcon("images\\icon.png"))
4743
information("The Program is in developement! \n"
48-
"Currently, only the textfiles are working, numbers and the other stuff are WIP. Masks aren't "
44+
"Currently, only the textfiles and numbers are working, the other stuff is WIP. . Masks aren't "
4945
"importable yet")
5046
self.ui.show()
5147

@@ -62,7 +58,7 @@ def __init__(self):
6258
# init a logfile
6359
logCreate()
6460
logWrite("The Program is in developement! \n"
65-
" Currently, only the textfiles are working, numbers and the other stuff are WIP. "
61+
" Currently, only the textfiles and numbers are working, the other stuff is WIP. "
6662
"Masks aren't "
6763
"importable yet \n")
6864

@@ -76,7 +72,7 @@ def __init__(self):
7672
newFilePath = dictCustom["path"]
7773

7874
# Set the read filepath so we got it internally to work with
79-
savestate.standardFilePath = newFilePath
75+
# savestate.standardFilePath = newFilePath
8076

8177
# Tell the log whats up
8278
for child in root.iter("filepath"):
@@ -87,7 +83,7 @@ def __init__(self):
8783
" Custom file path is " + str(root[0][0].attrib["path"]) + "\n"))
8884

8985
# Get the List back up from the xml and revisit the TXTs so they are what they were on last startup
90-
createListFiles(self, standardFilePath, newFilePath)
86+
createListFiles(self, standardFilePath)
9187

9288
# Make it work
9389
activateUi(self.ui)
@@ -97,18 +93,21 @@ def __init__(self):
9793
# window.listWidget.itemSelectionChanged.connect(lambda: updateSelection(self, 0))
9894
# window.listWidget_2.itemSelectionChanged.connect(lambda: updateSelection(self, 1))
9995

100-
window.actionSetMainFilePath.triggered.connect(lambda: setFilePath(self))
96+
window.actionSetMainFilePath.triggered.connect(lambda: setFilePath(self, newFilePath))
10197
window.actionStreamHelperDocumentation.triggered.connect(
10298
lambda: webbrowser.open("https://github.com/xFLLSquadronNorden/StreamHelper.py"))
10399
window.actionSave.triggered.connect(lambda: saveConfig(self, newFilePath))
104100
window.actionLoad.triggered.connect(lambda: loadConfig(self, newFilePath))
101+
window.actionQuit.triggered.connect(lambda: sys.exit(0))
105102

106103
window.updateButton.clicked.connect(lambda: getTextOfItem(self, oldFilePath, newFilePath))
107104

108105
window.actionLog.triggered.connect(lambda: webbrowser.open(standardFilePath + "\\StreamLog.log"))
109106

110107
window.actionVersion_Changes.triggered.connect(lambda: webbrowser.open("CHANGELOG.txt"))
111108

109+
110+
112111
else:
113112
ctypes.windll.shell32.ShellExecuteW(None, "runas", sys.executable, " ".join(sys.argv), None, 1)
114113

@@ -117,4 +116,3 @@ def __init__(self):
117116
app = QApplication(sys.argv)
118117
win = uiControlTest()
119118
sys.exit(app.exec_())
120-
# sys.stdout = old_stdout

0 commit comments

Comments
 (0)