[Jrisk-cvs] SF.net SVN: domination-code:[2698] Domination/sharedUI
Brought to you by:
yuranet
|
From: <yu...@us...> - 2025-10-21 23:10:17
|
Revision: 2698
http://sourceforge.net/p/domination/code/2698
Author: yuranet
Date: 2025-10-21 23:10:13 +0000 (Tue, 21 Oct 2025)
Log Message:
-----------
move segmented_control theme to lib
Modified Paths:
--------------
Domination/sharedUI/lib/MiniLobbyClient.jar
Domination/sharedUI/res_mapstore_lobby/ms_tabbar.xml
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
Removed Paths:
-------------
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_left.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_middle.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_right.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_left.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_middle.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_right.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_left.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_middle.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_right.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_left.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_middle.9.png
Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_right.9.png
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_left.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_middle.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_right.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_left.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_middle.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-mdpi/ms_segmented_control_selected_right.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_left.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_middle.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_right.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_left.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_middle.9.png
===================================================================
(Binary files differ)
Deleted: Domination/sharedUI/img_mapstore_lobby/drawable-xhdpi/ms_segmented_control_selected_right.9.png
===================================================================
(Binary files differ)
Modified: Domination/sharedUI/lib/MiniLobbyClient.jar
===================================================================
(Binary files differ)
Modified: Domination/sharedUI/res_mapstore_lobby/ms_tabbar.xml
===================================================================
--- Domination/sharedUI/res_mapstore_lobby/ms_tabbar.xml 2025-10-21 14:08:28 UTC (rev 2697)
+++ Domination/sharedUI/res_mapstore_lobby/ms_tabbar.xml 2025-10-21 23:10:13 UTC (rev 2698)
@@ -17,46 +17,6 @@
</style>
<bind style="badge" key="Badge"/>
-
- <style id="segmentedControlLeft">
- <opaque value="false"/>
- <state>
- <imagePainter path="/ms_segmented_control_left.9.png"/>
- <color type="FOREGROUND"/>
- </state>
- <state value="SELECTED">
- <imagePainter path="/ms_segmented_control_selected_left.9.png"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
- </state>
- </style>
- <bind style="segmentedControlLeft" key="SegmentedControlLeft"/>
-
- <style id="segmentedControlMiddle">
- <opaque value="false"/>
- <state>
- <imagePainter path="/ms_segmented_control_middle.9.png"/>
- <color type="FOREGROUND"/>
- </state>
- <state value="SELECTED">
- <imagePainter path="/ms_segmented_control_selected_middle.9.png"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
- </state>
- </style>
- <bind style="segmentedControlMiddle" key="SegmentedControlMiddle"/>
-
- <style id="segmentedControlRight">
- <opaque value="false"/>
- <state>
- <imagePainter path="/ms_segmented_control_right.9.png"/>
- <color type="FOREGROUND"/>
- </state>
- <state value="SELECTED">
- <imagePainter path="/ms_segmented_control_selected_right.9.png"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
- </state>
- </style>
- <bind style="segmentedControlRight" key="SegmentedControlRight"/>
-
<style id="indeterminateSpinner">
<imageIcon id="spinner_strip" path="/ms_strip.png" frameWidth="20" frameHeight="20"/>
<state>
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2025-10-21 14:08:28 UTC (rev 2697)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java 2025-10-21 23:10:13 UTC (rev 2698)
@@ -49,7 +49,12 @@
private List list;
public static void loadThemeExtension() {
- InputStream themeData = Application.getResourceAsStream("/ms_tabbar.xml");
+ loadThemeExtension("/ms_tabbar.xml");
+ loadThemeExtension("/segmented_control.xml");
+ }
+
+ public static void loadThemeExtension(String name) {
+ InputStream themeData = Application.getResourceAsStream(name);
try {
LookAndFeel laf = DesktopPane.getDesktopPane().getLookAndFeel();
if (laf instanceof SynthLookAndFeel) {
|