Skip to content

Commit 900dddf

Browse files
committed
v2.5.1
1 parent bf0b9d5 commit 900dddf

35 files changed

+1706
-6708
lines changed

source/Changlog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v2.5.1
2+
* Update Webdriver to 2025-09 version.
3+
* Change all "movie" instance to "group".
4+
* Test running helper with Stash that requires user/pass.
15
v2.4.7
26
* Change Middle Mouse Button to show a mini menu in browser.
37
* Remember the last visited page and open it next time Stash Helper runs. Can disable it in the settings.

source/CurrentImagesViewer.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Func CurrentImagesViewer()
3333

3434
Switch $sCategory
3535

36-
Case "movies", "scenes", "markers", "performers", "studios", "tags"
36+
Case "groups", "scenes", "markers", "performers", "studios", "tags"
3737
MsgBox(0, "Not support", "Sorry, this operation only supports images and galleries.")
3838
Return
3939
Case "images"

source/Forms/CustomizeForm.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Global $customList
99

1010
Func CustomList($sCategory, ByRef $aCategory)
11-
; sCategory is "Scenes","Movies"...
11+
; sCategory is "Scenes","Groups"...
1212
; aCategory is the array that contains Item_Handle, Item_Title, Item_Link
1313
; Global Enum $ITEM_HANDLE, $ITEM_TITLE, $ITEM_LINK
1414
; Global $iMaxSubItems

source/Forms/InitialSettingsForm.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Func InitialSettingsForm()
112112
GUICtrlSetFont(-1,16,400,0,"Palatino Linotype")
113113
GUICtrlSetBkColor(-1,"-2")
114114

115-
GUICtrlCreateLabel("Note: If this is the first time you run StashApp, it will ask you a question about where to store the config file. Since this is windows, you should choose -> 'In the current working directory.'"&@crlf&""&@crlf&"*** After you finish the wizard, you should click on 'Tasks' then 'Scan' to get your files recognized by Stash."&@crlf&"No movies? No Studio and Performers? No problem. This program will help you along the way.",201,290,895,307,-1,-1)
115+
GUICtrlCreateLabel("Note: If this is the first time you run StashApp, it will ask you a question about where to store the config file. Since this is windows, you should choose -> 'In the current working directory.'"&@crlf&""&@crlf&"*** After you finish the wizard, you should click on 'Tasks' then 'Scan' to get your files recognized by Stash."&@crlf&"No Studio and Performers? No problem. This program will help you along the way.",201,290,895,307,-1,-1)
116116
GUICtrlSetFont(-1,12,400,0,"Palatino Linotype")
117117
GUICtrlSetBkColor(-1,"-2")
118118

source/Forms/MergePerformers.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Func MergePerformers()
122122

123123
$hMsgDone = MsgBox(262436,"Transfer Done", "Now info from " & $sP1 & " is transfered to " & $sP2 & ", and " _
124124
& @CRLF & $sP1 & " is now an alias of " & $sP2 & @CRLF _
125-
& "and all the " & $sP1 & "'s scenes and movies are updated and added " & $sP2 & " to them as well." & @CRLF _
125+
& "and all the " & $sP1 & "'s scenes and groups are updated and added " & $sP2 & " to them as well." & @CRLF _
126126
& "Right now " & $sP1 & " is unchanged, but do you want to delete this performer to make it final?",0)
127127
If $hMsgDone = $IDYES Then
128128
; Delete Performer 1

source/Forms/MetroPopUpMenu.au3

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Func MetroPopUpMenu()
88
Local $iGuiX = $aPos[0], $iGuiY = $aPos[1]
99
#include "MetroPopup.isf"
1010
Local $aButtonIDs = [ $btnMetroPlay, $btnMetroAddToList, $btnMetroSendList, _
11-
$btnMetroEditList, $btnMetroCreateMovie, $btnMetroCopyScene, $btnMetroCancel]
11+
$btnMetroEditList, $btnMetroCreateGroup, $btnMetroCopyScene, $btnMetroCancel]
1212
GUISetIcon("helper2.ico")
1313
GUISetState()
1414
While True
@@ -19,12 +19,12 @@ Func MetroPopUpMenu()
1919
Case $btnMetroPlay
2020
$sCatNo = GetCurrentTabCategoryAndNumber()
2121
If StringInStr($sCatNo, "-") = 0 Then
22-
MsgBox(0, "Not support", "You are in category: " & $sCatNo & ". You need to browse to one scene or movie." )
22+
MsgBox(0, "Not support", "You are in category: " & $sCatNo & ". You need to browse to one scene or group." )
2323
Else
2424
$aCatNo = StringSplit($sCatNo, "-")
2525
If $aCatNo[0] = 2 and StringIsDigit( $aCatNo[2]) Then
2626
Switch $aCatNo[1]
27-
Case "scenes", "movies", "images", "galleries"
27+
Case "scenes", "groups", "images", "galleries"
2828
GUISetState( @SW_HIDE, $guiMetroPopup )
2929
PlayCurrentTab()
3030
ExitLoop
@@ -38,23 +38,6 @@ Func MetroPopUpMenu()
3838

3939
Case $btnMetroAddToList
4040
AddItemToList()
41-
;~ $sCatNo = GetCurrentTabCategoryAndNumber()
42-
;~ If StringInStr($sCatNo, "-") = 0 Then
43-
;~ MsgBox(0, "Not support", "You are in category: " & $sCatNo & ". You need to browse to one scene or movie.")
44-
;~ Else
45-
;~ $aCatNo = StringSplit($sCatNo, "-")
46-
;~ If $aCatNo[0] = 2 And StringIsDigit( $aCatNo[2] ) Then
47-
;~ Switch $aCatNo[1]
48-
;~ Case "scenes", "movies", "images", "galleries"
49-
;~ GUISetState( @SW_HIDE, $guiMetroPopup )
50-
;~ AddItemToList()
51-
;~ ExitLoop
52-
;~ EndSwitch
53-
;~ EndIf
54-
;~ c( "$sCatNo:" & $sCatNo)
55-
;~ MsgBox(262192,"Not supported","The current page is not supported.",0)
56-
;~ ContinueLoop
57-
;~ EndIf
5841

5942
Case $btnMetroSendList
6043
GUISetState( @SW_HIDE, $guiMetroPopup )
@@ -64,15 +47,15 @@ Func MetroPopUpMenu()
6447
GUISetState( @SW_HIDE, $guiMetroPopup )
6548
ManagePlayList()
6649
ExitLoop
67-
Case $btnMetroCreateMovie
50+
Case $btnMetroCreateGroup
6851
$sCatNo = GetCurrentTabCategoryAndNumber()
6952
If StringInStr($sCatNo, "-") = 0 Then
7053
MsgBox(0, "Not support", "You are in category: " & $sCatNo & ". You need to browse to one scene.")
7154
Else
7255
$aCatNo = StringSplit($sCatNo, "-")
7356
If $aCatNo[0] = 2 And $aCatNo[1] = "scenes" And StringIsDigit( $aCatNo[2] ) Then
7457
GUISetState( @SW_HIDE, $guiMetroPopup )
75-
Scene2Movie()
58+
Scene2Group()
7659
ExitLoop
7760
Else
7861
c( "$sCatNo:" & $sCatNo)

source/Forms/MetroPopup.isf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ GUICtrlSetFont(-1,12,400,0,"Tahoma")
2121
GUICtrlSetColor(-1,"0xFFFFFF")
2222
GUICtrlSetBkColor(-1,"0x202B33")
2323
GUICtrlSetTip(-1,"Edit current playlist.")
24-
Local $btnMetroCreateMovie = GUICtrlCreateButton("Create Movie from this Scene",3,192,426,48,-1,-1)
24+
Local $btnMetroCreateGroup = GUICtrlCreateButton("Create Group from this Scene",3,192,426,48,-1,-1)
2525
GUICtrlSetFont(-1,12,400,0,"Tahoma")
2626
GUICtrlSetColor(-1,"0xFFFFFF")
2727
GUICtrlSetBkColor(-1,"0x202B33")
@@ -79,7 +79,7 @@ gui_event_resized=
7979
gui_event_dropped=
8080
defaultfont=MS Sans Serif
8181
defaultfontsize=8
82-
[0x000A27EE]
82+
[0x00092052]
8383
type=button
8484
handle=445
8585
locked=0
@@ -108,7 +108,7 @@ tabpage=-1
108108
iconindex=
109109
iconlarge=0
110110
textmode=text
111-
[0x000227EC]
111+
[0x00022050]
112112
type=button
113113
handle=446
114114
locked=0
@@ -137,7 +137,7 @@ iconindex=
137137
iconlarge=0
138138
textmode=text
139139
order=2
140-
[0x00022828]
140+
[0x0002204E]
141141
type=button
142142
handle=447
143143
locked=0
@@ -166,7 +166,7 @@ iconindex=
166166
iconlarge=0
167167
textmode=text
168168
order=3
169-
[0x0002282A]
169+
[0x0002204C]
170170
type=button
171171
handle=448
172172
locked=0
@@ -195,7 +195,7 @@ iconindex=
195195
iconlarge=0
196196
textmode=text
197197
order=4
198-
[0x0009282C]
198+
[0x0002204A]
199199
type=button
200200
handle=449
201201
locked=0
@@ -212,8 +212,8 @@ fontattribute=0
212212
tooltip=Create a movie from this scene. Or create movies.
213213
bgimage=
214214
textcolour=0xFFFFFF
215-
id=$btnMetroCreateMovie
216-
text=Create Movie from this Scene
215+
id=$btnMetroCreateGroup
216+
text=Create Group from this Scene
217217
state=$GUI_SHOW+$GUI_ENABLE
218218
style=
219219
exstyle=
@@ -224,7 +224,7 @@ iconindex=
224224
iconlarge=0
225225
textmode=text
226226
order=5
227-
[0x000A1F2A]
227+
[0x00022048]
228228
type=button
229229
handle=450
230230
locked=0
@@ -253,7 +253,7 @@ iconindex=
253253
iconlarge=0
254254
textmode=text
255255
order=6
256-
[0x000E1E58]
256+
[0x00022046]
257257
type=button
258258
handle=451
259259
locked=0
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
If Not (@Compiled ) Then DllCall("User32.dll","bool","SetProcessDPIAware")
99

10-
$Scene2Movie = GUICreate("Copy Scene Info To Movie",766,968,-1,-1,$WS_SIZEBOX,-1)
11-
GUICtrlCreateLabel("Please choose the information you like to transfer to the movie.",32,23,698,80,-1,-1)
10+
$Scene2Group = GUICreate("Copy Scene Info To Group",766,968,-1,-1,$WS_SIZEBOX,-1)
11+
GUICtrlCreateLabel("Please choose the information you like to transfer to the group.",32,23,698,80,-1,-1)
1212
GUICtrlSetFont(-1,12,400,0,"Tahoma")
1313
GUICtrlSetBkColor(-1,"-2")
1414
GUICtrlSetResizing(-1,550)
@@ -32,13 +32,13 @@ GUICtrlSetFont(-1,12,400,0,"Tahoma")
3232
GUICtrlSetResizing(-1,804)
3333
$imgCover = GUICtrlCreatePic("",29,448,455,314,-1,$WS_EX_STATICEDGE)
3434
GUICtrlSetResizing(-1,102)
35-
$btnBatchCreateStudio = GUICtrlCreateButton("Create movies for scenes in same Studio",100,780,555,51,-1,-1)
35+
$btnBatchCreateStudio = GUICtrlCreateButton("Create groups for scenes in same Studio",100,780,555,51,-1,-1)
3636
GUICtrlSetFont(-1,12,400,0,"Tahoma")
37-
GUICtrlSetTip(-1,"Create movies for all other scenes in the same studio that don't link to a movie yet.")
37+
GUICtrlSetTip(-1,"Create movies for all other scenes in the same studio that don't link to a group yet.")
3838
GUICtrlSetResizing(-1,836)
39-
$btnBatchCreate = GUICtrlCreateButton("Create movies for all other scenes",100,846,555,51,-1,-1)
39+
$btnBatchCreate = GUICtrlCreateButton("Create groups for all other scenes",100,846,555,51,-1,-1)
4040
GUICtrlSetFont(-1,12,400,0,"Tahoma")
41-
GUICtrlSetTip(-1,"Create movies for all other scenes that don't link to a movie yet.")
41+
GUICtrlSetTip(-1,"Create movies for all other scenes that don't link to a group yet.")
4242
GUICtrlSetResizing(-1,836)
4343
$chkCover = GUICtrlCreateCheckbox("Cover",39,405,150,33,-1,-1)
4444
GUICtrlSetFont(-1,12,400,0,"Tahoma")
@@ -50,14 +50,14 @@ GUICtrlSetResizing(-1,802)
5050
[gui]
5151
Handle_deklaration=default
5252
Handle_deklaration_const=false
53-
title=Copy Scene Info To Movie
53+
title=Copy Scene Info To Group
5454
breite=766
5555
hoehe=968
5656
style=$WS_SIZEBOX
5757
exstyle=-1
5858
bgcolour=0xF0F0F0
5959
bgimage=none
60-
handle=$Scene2Movie
60+
handle=$Scene2Group
6161
parent=
6262
code=
6363
codebeforegui=If Not (@Compiled ) Then DllCall("User32.dll","bool","SetProcessDPIAware")
@@ -86,7 +86,7 @@ gui_event_resized=
8686
gui_event_dropped=
8787
defaultfont=MS Sans Serif
8888
defaultfontsize=8
89-
[0x0008282E]
89+
[0x00141EE8]
9090
type=listview
9191
handle=445
9292
locked=0
@@ -115,7 +115,7 @@ tabpage=-1
115115
iconindex=
116116
iconlarge=0
117117
textmode=text
118-
[0x00032834]
118+
[0x000F202C]
119119
type=label
120120
handle=446
121121
locked=0
@@ -133,7 +133,7 @@ tooltip=
133133
bgimage=
134134
textcolour=0x000000
135135
id=
136-
text=Please choose the information you like to transfer to the movie.
136+
text=Please choose the information you like to transfer to the group.
137137
state=$GUI_SHOW+$GUI_ENABLE
138138
style=
139139
exstyle=
@@ -144,7 +144,7 @@ tabpage=-1
144144
iconindex=
145145
iconlarge=0
146146
textmode=text
147-
[0x00012836]
147+
[0x00082026]
148148
type=button
149149
handle=447
150150
locked=0
@@ -173,7 +173,7 @@ tabpage=-1
173173
iconindex=
174174
iconlarge=0
175175
textmode=text
176-
[0x00012838]
176+
[0x00122022]
177177
type=button
178178
handle=448
179179
locked=0
@@ -202,7 +202,7 @@ iconindex=
202202
iconlarge=0
203203
textmode=text
204204
order=5
205-
[0x0001283A]
205+
[0x00121FBE]
206206
type=checkbox
207207
handle=449
208208
locked=0
@@ -231,7 +231,7 @@ tabpage=-1
231231
iconindex=
232232
iconlarge=0
233233
textmode=text
234-
[0x0001283C]
234+
[0x000E1EF4]
235235
type=image
236236
handle=450
237237
locked=0
@@ -260,7 +260,7 @@ tabpage=-1
260260
iconindex=
261261
iconlarge=0
262262
textmode=text
263-
[0x0001283E]
263+
[0x00072034]
264264
type=button
265265
handle=451
266266
locked=0
@@ -274,11 +274,11 @@ font=Tahoma
274274
fontsize=12
275275
fontstyle=400
276276
fontattribute=0
277-
tooltip=Create movies for all other scenes that don't link to a movie yet.
277+
tooltip=Create movies for all other scenes that don't link to a group yet.
278278
bgimage=
279279
textcolour=0x000000
280280
id=$btnBatchCreate
281-
text=Create movies for all other scenes
281+
text=Create groups for all other scenes
282282
state=$GUI_SHOW+$GUI_ENABLE
283283
style=
284284
exstyle=
@@ -289,7 +289,7 @@ tabpage=-1
289289
iconindex=
290290
iconlarge=0
291291
textmode=text
292-
[0x00012840]
292+
[0x000E1F1C]
293293
type=button
294294
handle=452
295295
locked=0
@@ -303,11 +303,11 @@ font=Tahoma
303303
fontsize=12
304304
fontstyle=400
305305
fontattribute=0
306-
tooltip=Create movies for all other scenes in the same studio that don't link to a movie yet.
306+
tooltip=Create movies for all other scenes in the same studio that don't link to a group yet.
307307
bgimage=
308308
textcolour=0x000000
309309
id=$btnBatchCreateStudio
310-
text=Create movies for scenes in same Studio
310+
text=Create groups for scenes in same Studio
311311
state=$GUI_SHOW+$GUI_ENABLE
312312
style=
313313
exstyle=

0 commit comments

Comments
 (0)