Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-04-29 22:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

7.70

Browse Source 
LANGUAGE GUI UPDATED
https://github.com/tonikelope/megabasterd/issues/498
https://github.com/tonikelope/megabasterd/issues/397
This commit is contained in:
tonikelope 2023-01-08 12:34:17 +01:00
parent a0522bafa2
commit e1faf15267
13 changed files with 1404 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId>
<version>7.69</version>
<version>7.70</version>
<packaging>jar</packaging>
<repositories>
<repository>

122
src/main/java/com/tonikelope/megabasterd/AboutDialog.form
View File

@ -28,9 +28,10 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jPanel1" max="32767" attributes="0"/>
<Component id="subtitle_label" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="title_label" max="32767" attributes="0"/>
@ -78,7 +79,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="subtitle_label" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="made_in_spain_label" min="-2" max="-2" attributes="0"/>
<Component id="dot_com_label" alignment="1" min="-2" max="-2" attributes="0"/>
@ -93,7 +94,9 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="java_version" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@ -197,9 +200,9 @@
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
<Events>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="author_webpage_labelMouseReleased"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="author_webpage_labelMouseExited"/>
<EventHandler event="mouseEntered" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="author_webpage_labelMouseEntered"/>
<EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="author_webpage_labelMouseExited"/>
<EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="author_webpage_labelMouseReleased"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="mb_label">
@ -258,5 +261,114 @@
</Property>
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel3" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel5" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="32767" attributes="0"/>
<Component id="jLabel6" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="jLabel5">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/turkey.png"/>
</Property>
<Property name="text" type="java.lang.String" value="FabrieI"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/germany.png"/>
</Property>
<Property name="text" type="java.lang.String" value="NieckLikesCode"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/hungary.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Roschach96 "/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/china.png"/>
</Property>
<Property name="text" type="java.lang.String" value="linkea131"/>
<Property name="doubleBuffered" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel4">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/italy.png"/>
</Property>
<Property name="text" type="java.lang.String" value="bovirus "/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/images/flags/vietnam.png"/>
</Property>
<Property name="text" type="java.lang.String" value="rattybox"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Form>

89
src/main/java/com/tonikelope/megabasterd/AboutDialog.java
View File

@ -68,6 +68,13 @@ public class AboutDialog extends javax.swing.JDialog {
check_version_button = new javax.swing.JButton();
dot_com_label = new javax.swing.JLabel();
java_version = new javax.swing.JLabel();
jPanel1 = new javax.swing.JPanel();
jLabel5 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
jLabel3 = new javax.swing.JLabel();
jLabel1 = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("About");
@ -142,14 +149,14 @@ public class AboutDialog extends javax.swing.JDialog {
author_webpage_label.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
author_webpage_label.setDoubleBuffered(true);
author_webpage_label.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseReleased(java.awt.event.MouseEvent evt) {
author_webpage_labelMouseReleased(evt);
public void mouseEntered(java.awt.event.MouseEvent evt) {
author_webpage_labelMouseEntered(evt);
}
public void mouseExited(java.awt.event.MouseEvent evt) {
author_webpage_labelMouseExited(evt);
}
public void mouseEntered(java.awt.event.MouseEvent evt) {
author_webpage_labelMouseEntered(evt);
public void mouseReleased(java.awt.event.MouseEvent evt) {
author_webpage_labelMouseReleased(evt);
}
});
@ -164,7 +171,7 @@ public class AboutDialog extends javax.swing.JDialog {
check_version_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
check_version_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-restart-30.png"))); // NOI18N
check_version_button.setText("Check for updates");
check_version_button.setText("Check version");
check_version_button.setDoubleBuffered(true);
check_version_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@ -185,6 +192,64 @@ public class AboutDialog extends javax.swing.JDialog {
java_version.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
java_version.setText(System.getProperty("java.vm.name")+" "+System.getProperty("java.version"));
jLabel5.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/turkey.png"))); // NOI18N
jLabel5.setText("FabrieI");
jLabel2.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/germany.png"))); // NOI18N
jLabel2.setText("NieckLikesCode");
jLabel3.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/hungary.png"))); // NOI18N
jLabel3.setText("Roschach96 ");
jLabel1.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/china.png"))); // NOI18N
jLabel1.setText("linkea131");
jLabel1.setDoubleBuffered(true);
jLabel4.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/italy.png"))); // NOI18N
jLabel4.setText("bovirus ");
jLabel6.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
jLabel6.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/flags/vietnam.png"))); // NOI18N
jLabel6.setText("rattybox");
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addComponent(jLabel1)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel2)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel3)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel4)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel5)
.addGap(18, 18, Short.MAX_VALUE)
.addComponent(jLabel6)
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel1)
.addComponent(jLabel2)
.addComponent(jLabel3)
.addComponent(jLabel4)
.addComponent(jLabel5)
.addComponent(jLabel6))
.addContainerGap())
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@ -192,6 +257,7 @@ public class AboutDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(subtitle_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(title_label, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -228,7 +294,7 @@ public class AboutDialog extends javax.swing.JDialog {
.addComponent(check_version_button))))
.addGap(18, 18, 18)
.addComponent(subtitle_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(made_in_spain_label)
.addComponent(dot_com_label)
@ -240,7 +306,9 @@ public class AboutDialog extends javax.swing.JDialog {
.addComponent(author_webpage_label)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(java_version)
.addContainerGap())
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
pack();
@ -353,6 +421,13 @@ public class AboutDialog extends javax.swing.JDialog {
private javax.swing.JLabel author_webpage_label;
private javax.swing.JButton check_version_button;
private javax.swing.JLabel dot_com_label;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
private javax.swing.JPanel jPanel1;
private javax.swing.JLabel java_version;
private javax.swing.JLabel made_in_spain_label;
private javax.swing.JLabel mb_label;

1281
src/main/java/com/tonikelope/megabasterd/LabelTranslatorSingleton.java
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/tonikelope/megabasterd/MainPanel.java
View File

@ -67,7 +67,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
public static final String VERSION = "7.69";
public static final String VERSION = "7.70";
public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;

22
src/main/java/com/tonikelope/megabasterd/SettingsDialog.java
View File

@ -627,6 +627,12 @@ public class SettingsDialog extends javax.swing.JDialog {
this.language_combo.addItem(LabelTranslatorSingleton.getInstance().translate("Chinese"));
this.language_combo.addItem(LabelTranslatorSingleton.getInstance().translate("Vietnamese"));
this.language_combo.addItem(LabelTranslatorSingleton.getInstance().translate("German"));
this.language_combo.addItem(LabelTranslatorSingleton.getInstance().translate("Hungarian"));
if (language == null) {
language = MainPanel.DEFAULT_LANGUAGE;
}
@ -641,6 +647,12 @@ public class SettingsDialog extends javax.swing.JDialog {
this.language_combo.setSelectedItem(LabelTranslatorSingleton.getInstance().translate("Turkish"));
} else if (language.equals("CH")) {
this.language_combo.setSelectedItem(LabelTranslatorSingleton.getInstance().translate("Chinese"));
} else if (language.equals("VI")) {
this.language_combo.setSelectedItem(LabelTranslatorSingleton.getInstance().translate("Vietnamese"));
} else if (language.equals("GE")) {
this.language_combo.setSelectedItem(LabelTranslatorSingleton.getInstance().translate("German"));
} else if (language.equals("HU")) {
this.language_combo.setSelectedItem(LabelTranslatorSingleton.getInstance().translate("Hungarian"));
}
String custom_proxy_list = DBTools.selectSettingValue("custom_proxy_list");
@ -1856,8 +1868,6 @@ public class SettingsDialog extends javax.swing.JDialog {
font = "ALTERNATIVE";
}
settings.put("font", font);
String old_language = DBTools.selectSettingValue("language");
if (old_language == null) {
@ -1872,14 +1882,22 @@ public class SettingsDialog extends javax.swing.JDialog {
language = "ES";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("Italian"))) {
language = "IT";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("German"))) {
language = "GE";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("Hungarian"))) {
language = "HU";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("Turkish"))) {
language = "TU";
font = "DEFAULT";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("Chinese"))) {
language = "CH";
font = "ALTERNATIVE";
} else if (language.equals(LabelTranslatorSingleton.getInstance().translate("Vietnamese"))) {
language = "VI";
}
settings.put("font", font);
settings.put("language", language);
String old_zoom = DBTools.selectSettingValue("font_zoom");

BIN
src/main/resources/images/flags/china.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
src/main/resources/images/flags/germany.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
src/main/resources/images/flags/hungary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/main/resources/images/flags/italy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
src/main/resources/images/flags/turkey.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
src/main/resources/images/flags/vietnam.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
src/main/resources/images/mbasterd_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 KiB

After

Width:  |  Height:  |  Size: 185 KiB