Merge pull request #2 from xeyossr/xeyossr/main

Birtakım yenilikler

Author: lexionq

.gitignore

@@ -1,2 +1,5 @@
 public/browser/*.txt
+anka-browser.spec
 venv
+dist
+build

anka-browser.py

@@ -6,10 +6,31 @@
 from PyQt6.QtGui import *
 import configparser
 import json
+import re
 
 
+home = os.path.expanduser('~')
+config_anka = f"{home}/.config/Anka"
+
+if not os.path.exists(config_anka):
+    os.makedirs(config_anka)
+
+config_path = f"{config_anka}/config.conf"
+
+if not os.path.exists(config_path):
+    with open(config_path, 'w') as cf:
+        cf.write("""[Settings]
+search_engine = https://google.com
+
+[Appearance]
+tab_color = #2aa1b3
+not_selected_tab_color = #22818f
+
+[Language]
+language = tr-TR
+""")
+
 
-config_path = "./config/config.conf"
 config = configparser.ConfigParser()
 config.read(config_path)
 
@@ -19,28 +40,17 @@
     "en-US": "English",
 }
 
-with open(f"./public/browser/languages/{language}.json", "r", encoding="UTF-8") as jsonn:
+with open(f"{config_anka}/public/browser/languages/{language}.json", "r", encoding="UTF-8") as jsonn:
     texts = json.load(jsonn)
 
 tab_name =  texts["tab-name"]
-history = "./public/browser/history.txt"
-bookmarks = "./public/browser/bookmarks.txt"
+history = f"{config_anka}/public/browser/history.txt"
+bookmarks = f"{config_anka}/public/browser/bookmarks.txt"
 
 if not os.path.exists(history):
     with open(history, 'x') as history_file:
        pass 
-if not os.path.exists(config_path):
-    with open(config_path, 'w') as cf:
-        cf.write("""[Settings]
-search_engine = https://google.com
-
-[Appearance]
-tab_color = #2aa1b3
-not_selected_tab_color = #22818f
 
-[Language]
-language = tr-TR
-""")
 if not os.path.exists(bookmarks):
     with open(bookmarks, 'x') as bf:
         pass
@@ -57,6 +67,7 @@ def __init__(self):
 
 
         self.tabs = QTabWidget()
+        self.max_tab_text_length = 18
         self.tabs.setStyleSheet(f"""            
         QTabBar::tab{{
              background: {notselected_tab_color};
@@ -65,8 +76,6 @@ def __init__(self):
              height:25px;
              border-radius: 10px;
              padding: 5px;
-
-        
         
         }}
         QTabBar::tab::selected{{
@@ -78,7 +87,7 @@ def __init__(self):
 
         self.tabs.tabCloseRequested.connect(self.close_tab)
 
-        self.setWindowIcon(QIcon("public/img/logo.ico"))
+        self.setWindowIcon(QIcon(f"{config_anka}/public/img/logo.ico"))
 
         self.add_new_tab(QUrl(search_engine), tab_name)
 
@@ -92,52 +101,52 @@ def __init__(self):
 
         self.back_button = QPushButton()
         self.back_button.clicked.connect(self.browser_back)
-        self.back_button.setIcon(QIcon("./public/img/back.png"))
+        self.back_button.setIcon(QIcon(f"{config_anka}/public/img/back.png"))
         self.back_button.setFixedSize(QSize(20, 20))
         self.back_button.setIconSize(QSize(20, 20))
         self.back_button.setStyleSheet("background-color: transparent; border: none;")
         self.back_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         self.forward_button = QPushButton()
         self.forward_button.clicked.connect(self.browser_forward)
-        self.forward_button.setIcon(QIcon("public/img/forward.png"))
+        self.forward_button.setIcon(QIcon(f"{config_anka}/public/img/forward.png"))
         self.forward_button.setFixedSize(QSize(20, 20))
         self.forward_button.setIconSize(QSize(20, 20))
         self.forward_button.setStyleSheet("background-color: transparent; border: none;")
         self.forward_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         self.new_tab_button = QPushButton()
         self.new_tab_button.clicked.connect(self.add_new_tab_button)
-        self.new_tab_button.setIcon(QIcon("public/img/newtab.png"))
+        self.new_tab_button.setIcon(QIcon(f"{config_anka}/public/img/newtab.png"))
         self.new_tab_button.setFixedSize(QSize(20, 20))
         self.new_tab_button.setIconSize(QSize(20, 20))
         self.new_tab_button.setStyleSheet("background-color: transparent; border: none;")
         self.new_tab_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         self.reload_button = QPushButton()
         self.reload_button.clicked.connect(self.browser_reload)
-        self.reload_button.setIcon(QIcon("public/img/reload.png"))
+        self.reload_button.setIcon(QIcon(f"{config_anka}/public/img/reload.png"))
         self.reload_button.setFixedSize(QSize(20, 20))
         self.reload_button.setIconSize(QSize(20, 20))
         self.reload_button.setStyleSheet("background-color: transparent; border: none;")
         self.reload_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
 
         self.bookmark_button = QPushButton() 
         self.bookmark_button.clicked.connect(self.bookmark)
-        self.bookmark_button.setIcon(QIcon("public/img/bookmark-regular.png"))
+        self.bookmark_button.setIcon(QIcon(f"{config_anka}/public/img/bookmark-regular.png"))
         self.bookmark_button.setFixedSize(QSize(20,20))
         self.bookmark_button.setIconSize(QSize(20,20))
         self.bookmark_button.setStyleSheet("background-color: transparent; border: none;")
         self.bookmark_button.setCursor(Qt.CursorShape.PointingHandCursor)
 
 
         self.settings_button = QPushButton()
-        self.settings_button.clicked.connect(self.open_settings)
-        self.settings_button.setIcon(QIcon("public/img/settingsbar.png"))
+        self.settings_button.setIcon(QIcon(f"{config_anka}/public/img/settingsbar.png"))
         self.settings_button.setFixedSize(QSize(20, 20))
         self.settings_button.setIconSize(QSize(20, 20))
         self.settings_button.setStyleSheet("background-color: transparent; border: none; margin-right: 8px;")
         self.settings_button.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+        self.settings_button.clicked.connect(self.show_settings_menu)
 
         top_layout = QHBoxLayout()
         top_layout.setContentsMargins(0,0,0,0)
@@ -167,16 +176,54 @@ def __init__(self):
 
         self.setWindowTitle("Anka")
         self.showMaximized()  
-        self.setWindowIcon(QIcon("public/img/logo.ico"))
+        self.setWindowIcon(QIcon(f"{config_anka}/public/img/logo.ico"))
         self.resize(1920, 1080)
 
         self.tabs.currentChanged.connect(self.update_url_from_tab)
 
-        
+    def show_settings_menu(self):
+        menu = QMenu(self)
+        history_action = QAction(texts['history'], self)
+        history_action.triggered.connect(self.show_history)
+        menu.addAction(history_action)
+
+        settings_action = QAction(texts['settings'], self)
+        settings_action.triggered.connect(self.open_settings)
+        menu.addAction(settings_action)
+
+        button_position = self.settings_button.mapToGlobal(QPoint(0, self.settings_button.height()))
+        menu.exec(button_position)
+
+    def show_history(self):
+        history_dialog = QDialog(self)
+        history_dialog.setWindowTitle("History")
+        history_dialog.setFixedSize(600, 400)
+
+        layout = QVBoxLayout(history_dialog)
+
+        history_list = QListWidget()
+        layout.addWidget(history_list)
+
+        # Load history from file
+        if os.path.exists(history):
+            with open(history, 'r', encoding="utf-8") as file:
+                lines = file.readlines()
+                for line in lines:
+                    line = line.strip()
+                    if line:
+                        history_list.addItem(line)
+
+        close_button = QPushButton(texts['close'])
+        close_button.clicked.connect(history_dialog.close)
+        layout.addWidget(close_button)
+
+        history_dialog.exec()
+
+
     def add_new_tab(self, url, label):
         new_browser = QWebEngineView()
         new_browser.setUrl(QUrl(search_engine))
-        self.tabs.addTab(new_browser, label)
+        self.tabs.addTab(new_browser, self.truncate_tab_text(label))
         self.tabs.setCurrentWidget(new_browser)
 
         self.close_tab_button = QPushButton()
@@ -187,6 +234,7 @@ def add_new_tab(self, url, label):
         new_browser.urlChanged.connect(lambda q: self.update_url(q))
         new_browser.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
         new_browser.customContextMenuRequested.connect(self.show_context_menu)
+
     def close_tab(self, index):
         if self.tabs.count() == 1:
             exit()
@@ -195,7 +243,13 @@ def close_tab(self, index):
 
     def update_title(self, browser, title):
         index = self.tabs.indexOf(browser)
-        self.tabs.setTabText(index, title if title else tab_name)
+        #self.tabs.setTabText(index, title if title else tab_name)
+        self.tabs.setTabText(index, self.truncate_tab_text(title if title else tab_name))
+
+    def truncate_tab_text(self, text):
+        if len(text) > self.max_tab_text_length:
+            return text[:self.max_tab_text_length] + "..."
+        return text
 
     def add_new_tab_button(self):
         self.add_new_tab(search_engine, tab_name)
@@ -221,9 +275,11 @@ def update_url_from_tab(self):
             self.url_bar.setText(current_url.toString())
 
     def load_url(self):
-        url = self.url_bar.text()
-        if url.startswith("http://") or url.startswith("https://"):
-            url = url
+        url = self.url_bar.text().strip()
+
+        if re.match(r"^[^\s]+\.[^\s]+$", url):
+            if not url.startswith("http://") and not url.startswith("https://"):
+                url = "http://" + url
         else:
             if search_engine == "https://duckduckgo.com":
                 url = search_engine + "/?q=" + url
@@ -280,7 +336,7 @@ def browser_save(self):
         current_browser.page().toHtml(self.save_html)
 
     def save_html(self, html):
-        file_name, _ = QFileDialog.getSaveFileName(self, "Kaydet", "", "HTML Dosyası (*.html);;WEBP Dosyası(*.webp);;Tüm Dosyalar (*)")
+        file_name, _ = QFileDialog.getSaveFileName(self, texts['right-click-save'], "", f"{texts['html_file']} (*.html);;{texts['webp_file']}(*.webp);;{texts['all_files']} (*)")
         if file_name:
             with open(file_name, 'w', encoding='utf-8') as file:
                 file.write(html)
@@ -310,9 +366,6 @@ def load_bookmarks(self, top_layout):
                     bookmark_button.clicked.connect(lambda checked, url=url: self.add_new_tab(QUrl(url), url))
                     top_layout.addWidget(bookmark_button)   
 
-
-     
-
 
 class AnkaBrowserSettings(QDialog):
     def __init__(self, parent=None):
@@ -401,13 +454,12 @@ def ok(self):
             config["Settings"]["search_engine"] = "https://bing.com"
         elif s_engine == "Brave":
             config["Settings"]["search_engine"] = "https://search.brave.com"
-        elif s_engine == "StartPage":
+        elif s_engine == "Startpage":
             config["Settings"]["search_engine"] = "https://startpage.com"
 
-        
         lan = self.language.currentData()
         config["Language"]["language"] = lan
-        with open('config/config.conf', 'w' ) as configfile:
+        with open(config_path, 'w' ) as configfile:
             config.write(configfile)
         self.accept()
 
@@ -438,7 +490,7 @@ def __init__(self, parent=None):
         config["Appearance"]["tab_color"] = str(tabColor)
         config["Appearance"]["not_selected_tab_color"] = str(not_selected_tab_color)
 
-        with open('config/config.conf', 'w' ) as configfile:
+        with open(config_path, 'w' ) as configfile:
             config.write(configfile)
 
 

public/browser/languages/en-US.json

@@ -7,6 +7,10 @@
     "right-click-back" : "Back",
     "right-click-forward" : "Forward",
     "right-click-reload" : "Reload",
+    "settings": "Settings",
+    "html_file": "HTML File",
+    "webp_file": "WEBP File",
+    "all_files": "All Files",
     "settings-title" : "Anka | Settings",
     "settings-search-engine" : "Search Engine: ",
     "settings-tab-color-label" : "Select tab color: ",
@@ -15,6 +19,8 @@
     "settings-info-msg" : "Please restart the browser for the changes to take effect.",
     "settings-button-ok" : "Ok",
     "settings-button-cancel" : "Cancel",
+    "close": "Close",
+    "history": "History",
     "tab-color-dialog-title" : "Anka | Select Color",
     "lang": "Language: "
 }

public/browser/languages/tr-TR.json

@@ -7,6 +7,10 @@
     "right-click-back" : "Geri",
     "right-click-forward" : "İleri",
     "right-click-reload" : "Yeniden Yükle",
+    "settings": "Ayarlar",
+    "html_file": "HTML Dosyası",
+    "webp_file": "WEBP Dosyası",
+    "all_files": "Tüm Dosyalar",
     "settings-title" : "Anka | Ayarlar",
     "settings-search-engine" : "Arama Motoru: ",
     "settings-tab-color-label" : "Sekme rengi seçin: ",
@@ -15,6 +19,8 @@
     "settings-info-msg" : "Değişikliklerin etkili olması için lütfen tarayıcıyı yeniden başlatın.",
     "settings-button-ok" : "Tamam",
     "settings-button-cancel" : "İptal",
+    "close": "Kapat",
+    "history": "Geçmiş",
     "tab-color-dialog-title" : "Anka | Renk Seçin",
     "lang": "Dil: "
 }

requirements.txt

@@ -1,2 +1,3 @@
 PyQt6
 PyQt6-WebEngine
+pyinstaller