Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
883a0cc6
Commit
883a0cc6
authored
Jun 10, 2018
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/prefs: fix reset of textfields
parent
537ef170
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
20 deletions
+2
-20
extras/package/macosx/VLC.xcodeproj/project.pbxproj
extras/package/macosx/VLC.xcodeproj/project.pbxproj
+0
-6
modules/gui/macosx/prefs.m
modules/gui/macosx/prefs.m
+0
-3
modules/gui/macosx/prefs_widgets.m
modules/gui/macosx/prefs_widgets.m
+2
-11
No files found.
extras/package/macosx/VLC.xcodeproj/project.pbxproj
View file @
883a0cc6
...
...
@@ -111,7 +111,6 @@
6BBBF9851F7B257100B404CD
/* VLCLogMessage.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
6BBBF9841F7B257100B404CD
/* VLCLogMessage.m */
;
};
6BF093F91EE0182B0049D8B0
/* VLCTimeField.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
6BF093F81EE0182B0049D8B0
/* VLCTimeField.m */
;
};
6BF5C5041EFE66EF008A9C12
/* VLCHUDTableView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
6BF5C5031EFE66EF008A9C12
/* VLCHUDTableView.m */
;
};
6BF5C5071EFE7E58008A9C12
/* VLCTintedImageButtonCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
6BF5C5061EFE7E58008A9C12
/* VLCTintedImageButtonCell.m */
;
};
7D2E0EDB20CD204D0033A221
/* VLCWindow.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D2E0ED920CD204D0033A221
/* VLCWindow.m */
;
};
7D2E0EDE20CD206F0033A221
/* VLCVideoWindowCommon.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D2E0EDD20CD206F0033A221
/* VLCVideoWindowCommon.m */
;
};
7DB40D2A20CBCEB500F63173
/* VLCMainMenu.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7DB40D2920CBCEB500F63173
/* VLCMainMenu.m */
;
};
...
...
@@ -393,8 +392,6 @@
6BF56C3D1FCF00AF004A411A
/* audiotoolbox_midi.c */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.c
;
name
=
audiotoolbox_midi.c
;
path
=
../../../modules/codec/audiotoolbox_midi.c
;
sourceTree
=
"<group>"
;
};
6BF5C5021EFE66EF008A9C12
/* VLCHUDTableView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
VLCHUDTableView.h
;
sourceTree
=
"<group>"
;
};
6BF5C5031EFE66EF008A9C12
/* VLCHUDTableView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
VLCHUDTableView.m
;
sourceTree
=
"<group>"
;
};
6BF5C5051EFE7E58008A9C12
/* VLCTintedImageButtonCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
VLCTintedImageButtonCell.h
;
sourceTree
=
"<group>"
;
};
6BF5C5061EFE7E58008A9C12
/* VLCTintedImageButtonCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
VLCTintedImageButtonCell.m
;
sourceTree
=
"<group>"
;
};
7D0A387820CBCC4D00D4BF3B
/* videotoolbox.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
videotoolbox.m
;
path
=
../../../modules/codec/videotoolbox.m
;
sourceTree
=
"<group>"
;
};
7D2E0ED920CD204D0033A221
/* VLCWindow.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
VLCWindow.m
;
sourceTree
=
"<group>"
;
};
7D2E0EDA20CD204D0033A221
/* VLCWindow.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
VLCWindow.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -985,8 +982,6 @@
children
=
(
6B3BE42A1E6217CB008D098A
/* VLCImageButton.h */
,
6B3BE42B1E6217CB008D098A
/* VLCImageButton.m */
,
6BF5C5051EFE7E58008A9C12
/* VLCTintedImageButtonCell.h */
,
6BF5C5061EFE7E58008A9C12
/* VLCTintedImageButtonCell.m */
,
);
name
=
Buttons
;
sourceTree
=
"<group>"
;
...
...
@@ -1586,7 +1581,6 @@
6B2EFC631F281A0900F3C0EA
/* VLCVolumeSliderCell.m in Sources */
,
1C3113A51E508C6900D4DD76
/* VLCCoreInteraction.m in Sources */
,
1C3113A71E508C6900D4DD76
/* VLCLogWindowController.m in Sources */
,
6BF5C5071EFE7E58008A9C12
/* VLCTintedImageButtonCell.m in Sources */
,
1C3113A91E508C6900D4DD76
/* VLCDocumentController.m in Sources */
,
1C3113AB1E508C6900D4DD76
/* VLCExtensionsDialogProvider.m in Sources */
,
1C3113AD1E508C6900D4DD76
/* VLCExtensionsManager.m in Sources */
,
...
...
modules/gui/macosx/prefs.m
View file @
883a0cc6
...
...
@@ -543,9 +543,6 @@
[[
pluginItem
options
]
addObject
:[[
VLCTreeLeafItem
alloc
]
initWithConfigItem
:
&
p_configs
[
j
]]];
}
}
else
{
msg_Err
(
getIntf
(),
"failed to handle index %i which is neither a category nor a subcategory"
,
j
);
}
}
}
module_list_free
(
modules
);
...
...
modules/gui/macosx/prefs_widgets.m
View file @
883a0cc6
...
...
@@ -973,12 +973,8 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame: s_rc]; \
-
(
void
)
resetValues
{
NSString
*
o_textfieldString
;
char
*
psz_value
=
config_GetPsz
(
self
.
p_item
->
psz_name
);
if
(
psz_value
)
o_textfieldString
=
_NS
(
psz_value
);
else
o_textfieldString
=
@""
;
[
o_textfield
setStringValue
:
toNSStr
(
psz_value
)];
free
(
psz_value
);
[
super
resetValues
];
}
...
...
@@ -1166,13 +1162,8 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame: s_rc]; \
-
(
void
)
resetValues
{
NSString
*
o_textfieldString
;
char
*
psz_value
=
config_GetPsz
(
self
.
p_item
->
psz_name
);
if
(
psz_value
)
o_textfieldString
=
[
NSString
stringWithFormat
:
@"%s"
,
psz_value
];
else
o_textfieldString
=
@""
;
[
o_textfield
setStringValue
:
toNSStr
(
psz_value
)];
free
(
psz_value
);
[
super
resetValues
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment