dil dosyası güncellendi. renk şeması ön izlemesinde text rengi vs. gö…

…sterimi sağlandı.
PisiLinuxNew · May 16, 2016 · 75d5f46 · 75d5f46
1 parent 39c6175
commit 75d5f46
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 121 deletions.
diff --git a/kaptan5/libkaptan/tabwidget.py b/kaptan5/libkaptan/tabwidget.py
@@ -2,7 +2,7 @@
                              QVBoxLayout, QSpacerItem, QWidget, QSizePolicy, QRadioButton, QCheckBox, QFrame,
                              QProgressBar, QSlider, QScrollBar, QListView, QListWidget, QSpinBox, QListWidgetItem,
                              QTextBrowser, QStyleFactory)
-from PyQt5.QtGui import QIcon, QPixmap, QTextCursor
+from PyQt5.QtGui import QIcon, QPixmap
 from PyQt5.QtCore import Qt, QEvent, QSize
 from .tools import iniToCss
 import os
@@ -105,11 +105,6 @@ def createTabColorScheme(self):
         self.listWidgetColorScheme.setObjectName("listWidgetColorScheme")
         self.verticalLayout_2.addWidget(self.listWidgetColorScheme)
 
-        self.previewWidgetColor = PreviewWidgetColor(self.tabColorScheme)
-        self.verticalLayout_2.addWidget(self.previewWidgetColor)
-
-        self.addTab(self.tabColorScheme, self.tr("Color Scheme"))
-
         color_list = os.listdir(self.colorSchemePath)
         color_list.sort()
 
@@ -118,12 +113,20 @@ def createTabColorScheme(self):
             item.setText(color.split(".")[0])
             item.colorSchemeName = color
 
-
         self.listWidgetColorScheme.itemClicked.connect(self.previewColorScheme)
+        self.listWidgetColorScheme.setCurrentRow(0)
+
+        self.previewWidgetColor = PreviewWidgetColor(self.tabColorScheme)
+        self.verticalLayout_2.addWidget(self.previewWidgetColor)
+
+        self.addTab(self.tabColorScheme, self.tr("Color Scheme"))
 
     def previewColorScheme(self, item):
-        css = iniToCss(os.path.join(self.colorSchemePath,item.colorSchemeName))
-        self.previewWidgetColor.previewGroupBox.setStyleSheet(css)
+        css = iniToCss(os.path.join(self.colorSchemePath, item.colorSchemeName))
+        self.previewWidgetColor.previewGroupBox.setStyleSheet(css[0])
+        self.previewWidgetColor.previewTextBrowser.setHtml("""<style>#unclicked {color : rgb(%s);}
+        #clicked {color : rgb(%s);}</style>"""%(css[1][0],css[1][1]) +
+        self.tr("""<p>Normal text <a id='unclicked' href='#'>link</a> <a id='clicked' href='#'>visited</a></p>"""))
 
     def createTabDesktopTheme(self):
         self.tabDesktopTheme = QWidget()
@@ -367,6 +370,7 @@ def __init__(self, parent=None):
         super().__init__(parent)
         self.setTitle(self.tr("Preview"))
         self.setMaximumHeight(120)
+        self.parent = parent
 
         vboxLayout = QVBoxLayout(self)
         self.previewGroupBox = QGroupBox(self)
@@ -390,18 +394,12 @@ def __init__(self, parent=None):
         self.previewTextBrowser = QTextBrowser(self.previewGroupBox)
         self.previewTextBrowser.setObjectName("previewTextBrowser")
 
-        self.previewTextBrowser.setHtml(self.tr("""<style>
-        #unclicked {color : rgb(255,0,0);}
-        #clicked {color : rgb(0,255,0);}
-        </style>
-        <p>Normal metin <a id='unclicked' href='#'>bağlantı</a> <a id='clicked' href='#'>ziyaret edilmiş</a></p>"""))
-
+        css = iniToCss(os.path.join("/usr/share/color-schemes", self.parent.children()[1].currentItem().colorSchemeName))
 
+        self.previewTextBrowser.setHtml("""<style>#unclicked {color : rgb(%s);}
+        #clicked {color : rgb(%s);}</style>"""%(css[1][0],css[1][1]) +
+        self.tr("""<p>Normal text <a id='unclicked' href='#'>link</a> <a id='clicked' href='#'>visited</a></p>"""))
 
-        cursor = self.previewTextBrowser.textCursor()
-        cursor.setPosition(39)
-        cursor.setPosition(76, QTextCursor.KeepAnchor)
-        self.previewTextBrowser.setTextCursor(cursor)
 
         self.horizontalLayout.addWidget(self.previewTextBrowser)
 

diff --git a/kaptan5/libkaptan/tools.py b/kaptan5/libkaptan/tools.py
@@ -190,7 +190,7 @@ def iniToCss(file):
     label text color
     button background-border-text
     groupbox background-bordor
-    textbrowser background-text-linktext-alinktext-selecttext
+    textbrowser background-text-linktext-alinktext
     """
 
     iniFile = QSettings(file, QSettings.IniFormat)
@@ -211,16 +211,16 @@ def iniToCss(file):
     QTextBrowser#previewTextBrowser {
     background-color : rgb(%s);
     color : rgb(%s);
-    selection-background-color : rgb(%s);
     }"""%(listToStr(iniFile.value("Colors:Window/ForegroundNormal")),
           listToStr(iniFile.value("Colors:Button/ForegroundNormal")),
           listToStr(iniFile.value("Colors:Button/BackgroundNormal")),
           listToStr(iniFile.value("Colors:Window/BackgroundNormal")),
           listToStr(iniFile.value("Colors:View/BackgroundNormal")),
-          listToStr(iniFile.value("Colors:View/ForegroundNormal")),
-          listToStr(iniFile.value("Colors:Selection/BackgroundNormal")))
+          listToStr(iniFile.value("Colors:View/ForegroundNormal")))
 
-    return cssText
+    textbrowser = listToStr(iniFile.value("Colors:View/ForegroundLink")), listToStr(iniFile.value("Colors:View/ForegroundVisited"))
+
+    return cssText, textbrowser
 
 
 #print(iniToCss("/usr/share/color-schemes/Breeze.colors"))