Skip to content

Commit 71e36f7

Browse files
committed
ui improwment and a lot of improvment on changelog
1 parent c96cb8c commit 71e36f7

File tree

7 files changed

+272
-230
lines changed

7 files changed

+272
-230
lines changed

data/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0
1+
v1.1

debian/changelog

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
pardus-android-emulator (1.0) stable; urgency=medium
1+
pardus-android-emulator (1.1) stable; urgency=medium
2+
3+
[ Muhammet Halak ]
4+
5+
* Code tamplet convert to Pardus standart
6+
* Changing button activation for avd list lb_wait_status
7+
* Adding back button in set properties and sdk chosing part
8+
* Name bugs fixing: whitespace, spacialchracter and same name
9+
* Translation update
10+
* Added waiting part when switching to sdk chosing part
11+
* ComboBox first initialization bug fixing
12+
* Small ui improvment
13+
* Icon path and .desktop file improvment
14+
* Added License alert for google license
15+
16+
217

318
* Initial Commit
419

po/files

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ui/ui3.glade
2-
ui/MainWindow.py
1+
ui/MainWindow.glade
2+
src/MainWindow.py

po/tr.po

Lines changed: 82 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1.0\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2023-07-18 20:15+0300\n"
10+
"POT-Creation-Date: 2023-07-20 19:29+0300\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Muhammet Halak <halakmuhammet145@gmail.com>Language-Team: "
1313
"Turkish <dev@pardus.org.tr>\n"
@@ -18,7 +18,7 @@ msgstr ""
1818
"Plural-Forms: nplurals=1; plural=0\n"
1919
"X-Generator: Gtranslator 3.38.0\n"
2020

21-
#: ui/ui3.glade:18
21+
#: ui/MainWindow.glade:18
2222
msgid ""
2323
"Bu program kesinlikle hiçbir garanti vermiyor.\n"
2424
"Ayrıntılar için <a href=\"https://www.gnu.org/licenses/gpl-3.0.html\">GNU "
@@ -28,31 +28,31 @@ msgstr ""
2828
"Ayrıntılar için <a href=\"https://www.gnu.org/licenses/gpl-3.0.html\">GNU "
2929
"Genel Kamu Lisansı, sürüm 3 ya da sonrası</a> bağlantısına bakın."
3030

31-
#: ui/ui3.glade:55
31+
#: ui/MainWindow.glade:55
3232
msgid "sdk manager not in system"
3333
msgstr "sdk yöneticisi sisteminizde bulunmamaktadır"
3434

35-
#: ui/ui3.glade:69
35+
#: ui/MainWindow.glade:69
3636
msgid "Accept Terms"
3737
msgstr "Kullanım Koşullarını Kabul Et"
3838

39-
#: ui/ui3.glade:84
39+
#: ui/MainWindow.glade:84
4040
msgid "No"
4141
msgstr "Hayır"
4242

43-
#: ui/ui3.glade:98
43+
#: ui/MainWindow.glade:98
4444
msgid "Yes"
4545
msgstr "Evet"
4646

47-
#: ui/ui3.glade:125
47+
#: ui/MainWindow.glade:125
4848
msgid ""
4949
"Your system dosn't have sdk manager. \n"
5050
"Do you want to install it?"
5151
msgstr ""
5252
"Sistemde sdk yöneticisi bulunmamaktadır. \n"
5353
"Yüklemek istiyor musunuz?"
5454

55-
#: ui/ui3.glade:154
55+
#: ui/MainWindow.glade:154
5656
msgid ""
5757
"Terms and Conditions\n"
5858
"\n"
@@ -723,196 +723,217 @@ msgid ""
723723
"June 2014."
724724
msgstr ""
725725

726-
#: ui/ui3.glade:521
726+
#: ui/MainWindow.glade:521
727727
msgid "Virtual Device List"
728728
msgstr "Sanal Cihaz Listesi"
729729

730-
#: ui/ui3.glade:582
730+
#: ui/MainWindow.glade:582
731731
msgid "Properties"
732732
msgstr "Özellikler"
733733

734-
#: ui/ui3.glade:616
734+
#: ui/MainWindow.glade:616
735735
msgid "Ram: "
736736
msgstr "Ram: "
737737

738-
#: ui/ui3.glade:631 ui/ui3.glade:672 ui/ui3.glade:713 ui/ui3.glade:754
739-
#: ui/ui3.glade:795 ui/ui3.glade:853 ui/ui3.glade:894 ui/ui3.glade:935
740-
#: ui/ui3.glade:976 ui/ui3.glade:1017 ui/ui3.glade:1359
738+
#: ui/MainWindow.glade:631 ui/MainWindow.glade:672 ui/MainWindow.glade:713
739+
#: ui/MainWindow.glade:754 ui/MainWindow.glade:795 ui/MainWindow.glade:853
740+
#: ui/MainWindow.glade:894 ui/MainWindow.glade:935 ui/MainWindow.glade:976
741+
#: ui/MainWindow.glade:1017 ui/MainWindow.glade:2064
741742
msgid "None"
742743
msgstr "Belli Değil"
743744

744-
#: ui/ui3.glade:657
745+
#: ui/MainWindow.glade:657
745746
msgid "Disk Partion: "
746747
msgstr "Disk Bölümü: "
747748

748-
#: ui/ui3.glade:698
749+
#: ui/MainWindow.glade:698
749750
msgid "Height: "
750751
msgstr "Yükseklik: "
751752

752-
#: ui/ui3.glade:739
753+
#: ui/MainWindow.glade:739
753754
msgid "Width: "
754755
msgstr "Genişlik: "
755756

756-
#: ui/ui3.glade:780
757+
#: ui/MainWindow.glade:780
757758
msgid "Display Density: "
758759
msgstr "Ekran Yoğunluğu: "
759760

760-
#: ui/ui3.glade:838
761+
#: ui/MainWindow.glade:838
761762
msgid "Keyboard: "
762763
msgstr "Klavye: "
763764

764-
#: ui/ui3.glade:879
765+
#: ui/MainWindow.glade:879
765766
msgid "Gpu: "
766767
msgstr "GPU: "
767768

768-
#: ui/ui3.glade:920
769+
#: ui/MainWindow.glade:920
769770
msgid "SD Card: "
770771
msgstr "SD Kart: "
771772

772-
#: ui/ui3.glade:961
773+
#: ui/MainWindow.glade:961
773774
msgid "Gsm Mode: "
774775
msgstr "GSM Modu: "
775776

776-
#: ui/ui3.glade:1002
777+
#: ui/MainWindow.glade:1002
777778
msgid "Cpu: "
778779
msgstr "İşlemci: "
779780

780-
#: ui/ui3.glade:1073
781+
#: ui/MainWindow.glade:1085
781782
msgid "New Virtual Android"
782783
msgstr "Yeni Sanal Android"
783784

784-
#: ui/ui3.glade:1087
785+
#: ui/MainWindow.glade:1099
785786
msgid "Edit"
786787
msgstr "Düzenle"
787788

788-
#: ui/ui3.glade:1101
789+
#: ui/MainWindow.glade:1113
789790
msgid "Delete"
790791
msgstr "Sil"
791792

792-
#: ui/ui3.glade:1115
793+
#: ui/MainWindow.glade:1127
793794
msgid "Start"
794795
msgstr "Başlat"
795796

796-
#: ui/ui3.glade:1129
797+
#: ui/MainWindow.glade:1141
797798
msgid "Force Stop"
798799
msgstr "Zorla Durdur"
799800

800-
#: ui/ui3.glade:1143
801+
#: ui/MainWindow.glade:1155
801802
msgid "Stop"
802803
msgstr "Durdur"
803804

804-
#: ui/ui3.glade:1165
805+
#: ui/MainWindow.glade:1177
805806
msgid "box_main"
806807
msgstr "ana_kutu"
807808

808-
#: ui/ui3.glade:1213
809+
#: ui/MainWindow.glade:1223
809810
msgid "Device Type"
810811
msgstr "Cihaz Türü"
811812

812-
#: ui/ui3.glade:1249
813+
#: ui/MainWindow.glade:1259
813814
msgid "Android Sdk Version"
814815
msgstr "Android Sdk Sürümü"
815816

816-
#: ui/ui3.glade:1277 ui/ui3.glade:1987
817+
#: ui/MainWindow.glade:1293 ui/MainWindow.glade:1960
818+
msgid "Back"
819+
msgstr "Geri"
820+
821+
#: ui/MainWindow.glade:1308 ui/MainWindow.glade:1975
817822
msgid "Next"
818823
msgstr "Sonraki"
819824

820-
#: ui/ui3.glade:1300
825+
#: ui/MainWindow.glade:1338
821826
msgid "box_android_chose"
822827
msgstr "android_secim_kutusu"
823828

824-
#: ui/ui3.glade:1371
825-
msgid "box_wait"
826-
msgstr "bekleme_kutusu"
827-
828-
#: ui/ui3.glade:1402
829+
#: ui/MainWindow.glade:1368
829830
msgid "Ram"
830831
msgstr "RAM"
831832

832-
#: ui/ui3.glade:1431
833+
#: ui/MainWindow.glade:1397
833834
msgid "2048"
834835
msgstr "2048"
835836

836-
#: ui/ui3.glade:1466
837+
#: ui/MainWindow.glade:1433
837838
msgid "Disk Partion"
838839
msgstr "Disk Bölümü"
839840

840-
#: ui/ui3.glade:1495
841+
#: ui/MainWindow.glade:1462
841842
msgid "20"
842843
msgstr "20"
843844

844-
#: ui/ui3.glade:1535
845+
#: ui/MainWindow.glade:1502
845846
msgid "Height"
846847
msgstr "Yükseklik"
847848

848-
#: ui/ui3.glade:1547 ui/ui3.glade:1586
849+
#: ui/MainWindow.glade:1514 ui/MainWindow.glade:1553
849850
msgid "720"
850851
msgstr "720"
851852

852-
#: ui/ui3.glade:1574
853+
#: ui/MainWindow.glade:1541
853854
msgid "Width"
854855
msgstr "Genişlik"
855856

856-
#: ui/ui3.glade:1620
857+
#: ui/MainWindow.glade:1588
857858
msgid "Display Density"
858859
msgstr "Ekran Yoğunluğu"
859860

860-
#: ui/ui3.glade:1649
861+
#: ui/MainWindow.glade:1617
861862
msgid "160"
862863
msgstr "160"
863864

864-
#: ui/ui3.glade:1698
865+
#: ui/MainWindow.glade:1664
865866
msgid "Name"
866867
msgstr "İsim"
867868

868-
#: ui/ui3.glade:1725
869+
#: ui/MainWindow.glade:1691
869870
msgid "Keyboard"
870871
msgstr "Klavye"
871872

872-
#: ui/ui3.glade:1764
873+
#: ui/MainWindow.glade:1730
873874
msgid "Gpu"
874875
msgstr "GPU"
875876

876-
#: ui/ui3.glade:1803
877+
#: ui/MainWindow.glade:1769
877878
msgid "SD Card"
878879
msgstr "SD Kart"
879880

880-
#: ui/ui3.glade:1841
881+
#: ui/MainWindow.glade:1807
881882
msgid "Gsm Mode"
882883
msgstr "GSM Modu"
883884

884-
#: ui/ui3.glade:1870
885+
#: ui/MainWindow.glade:1836
885886
msgid "CPU Core"
886887
msgstr "İşlemci çekirdeği"
887888

888-
#: ui/ui3.glade:1928
889+
#: ui/MainWindow.glade:1895
889890
msgid "Orientation"
890891
msgstr "Cihaz Yönü"
891892

892-
#: ui/ui3.glade:1943
893+
#: ui/MainWindow.glade:1910
893894
msgid "Landscape"
894895
msgstr "Yatay"
895896

896-
#: ui/ui3.glade:1958
897+
#: ui/MainWindow.glade:1925
897898
msgid "Portrait"
898899
msgstr "Dikey"
899900

900-
#: ui/ui3.glade:2009
901+
#: ui/MainWindow.glade:2005
901902
msgid "box_set_properties"
902903
msgstr "ozellikleri_ayarla_kutusu"
903904

904-
#: ui/ui3.glade:2026
905+
#: ui/MainWindow.glade:2076
906+
msgid "box_wait"
907+
msgstr "bekleme_kutusu"
908+
909+
#: ui/MainWindow.glade:2093
905910
msgid "Pardus Android Emulator"
906911
msgstr "Pardus Android Emülatörü"
907912

908-
#: ui/MainWindow.py:70
913+
#: src/MainWindow.py:71
909914
msgid "With Google and Play Store"
910915
msgstr "Google ve Play Store ile"
911916

912-
#: ui/MainWindow.py:71
917+
#: src/MainWindow.py:72
913918
msgid "With Google without Play Store"
914919
msgstr "Google olup Play Store olmadan"
915920

916-
#: ui/MainWindow.py:72
921+
#: src/MainWindow.py:73
917922
msgid "Without Google and Play Store"
918923
msgstr "Google ve Play Store olmadan"
924+
925+
#: src/MainWindow.py:282
926+
msgid "Please type different name"
927+
msgstr "Lütfen farklı bir isim girin"
928+
929+
#: src/MainWindow.py:291
930+
msgid "Please don't type whitespace"
931+
msgstr "Lütfen boşluk burakmayın"
932+
933+
#: src/MainWindow.py:295
934+
msgid "Please don't type spacial chracter(.*/şüİ~)"
935+
msgstr "Lütfen özel karakter(.*/şüİ~) kullanmayın"
936+
937+
#: src/MainWindow.py:327 src/MainWindow.py:328
938+
msgid "Waiting to get andorid sdk list..."
939+
msgstr "Android sdk listesi bekleniyor..."

src/Istaller.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async def main(self):
5656
def get_andorio_list(self, update_sdk_cmb):
5757
comand_runner = CommandRunner(
5858
co.cmd_system_image, self.lb_subpro_output, self.lb_wait_status,
59-
fun_with_output=[self.fill_android_sdk],fun_with_paramaters=[update_sdk_cmb])
59+
fun_with_output=[self.fill_android_sdk],fun_with_paramaters=update_sdk_cmb+[self.go_to_sdk])
6060
comand_runner.run()
6161
del comand_runner
6262

@@ -115,6 +115,9 @@ def intall_system_image(self, datas: dict,fn_up):#! burda hata olabilir
115115

116116
def go_to_main(self,o=None):
117117
GLib.idle_add(self.change_stack_page, "box_main")
118+
def go_to_sdk(self):
119+
GLib.idle_add(self.change_stack_page, "box_android_chose")
120+
118121

119122
def set_configuration(self, datas: dict):
120123
with open(f"{co.HOME}/.android-emulator/avd/{co.avd_name}.avd/config.ini", "r") as file:

src/MainWindow.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def is_word(self):
292292
return False
293293
elif any(not char.isalnum() and not char.isspace() for char in name) or bool(set(name).intersection(set(Turkish_c))):
294294
self.entry_name.set_text("")
295-
self.entry_name.set_placeholder_text(_("Please don't type spacial chracter"))
295+
self.entry_name.set_placeholder_text(_("Please don't type spacial chracter(.*/şüİ~)"))
296296
return False
297297
return True
298298

@@ -324,7 +324,10 @@ def on_chk_btn_term_accept_toggled(self, b):
324324
def on_btn_new_virt_android_clicked(self, b):
325325
self.is_main = True
326326
self.entry_name.set_sensitive(True)
327-
self.installer.get_andorio_list(self.fill_sdks)
327+
self.lb_dialog_wait_status=_("Waiting to get andorid sdk list...")
328+
self.lb_subpro_output=_("Waiting to get andorid sdk list...")
329+
self.stck_main.set_visible_child_name("box_wait")
330+
self.installer.get_andorio_list([self.fill_sdks])
328331

329332
def on_btn_force_stop_clicked(self, b):
330333
self.active_button(True)

0 commit comments

Comments
 (0)