Renamed desktop sharing to screen sharing and fixed stream type name

blink/mainwindow.py

@@ -243,7 +243,7 @@ class MainWindow(base_class, ui_class):
     def enable_call_buttons(self, enabled):
         self.audio_call_button.setEnabled(enabled)
         self.im_session_button.setEnabled(False)
-        self.ds_session_button.setEnabled(False)
+        self.ss_session_button.setEnabled(False)
 
     def load_audio_devices(self):
         settings = SIPSimpleSettings()

resources/blink.ui

@@ -685,7 +685,7 @@ padding: 2px;</string>
              </widget>
             </item>
             <item>
-             <widget class="ToolButton" name="ds_session_button">
+             <widget class="ToolButton" name="ss_session_button">
               <property name="minimumSize">
                <size>
                 <width>29</width>
@@ -699,7 +699,7 @@ padding: 2px;</string>
                </size>
               </property>
               <property name="toolTip">
-               <string>Start desktop sharing </string>
+               <string>Start screen sharing</string>
               </property>
               <property name="icon">
                <iconset>
@@ -1295,6 +1295,11 @@ padding: 2px;</string>
   </action>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ToolButton</class>
+   <extends>QToolButton</extends>
+   <header>blink.widgets.buttons</header>
+  </customwidget>
   <customwidget>
    <class>LineEdit</class>
    <extends>QLineEdit</extends>
@@ -1320,11 +1325,6 @@ padding: 2px;</string>
    <extends>QComboBox</extends>
    <header>blink.accounts</header>
   </customwidget>
-  <customwidget>
-   <class>ToolButton</class>
-   <extends>QToolButton</extends>
-   <header>blink.widgets.buttons</header>
-  </customwidget>
   <customwidget>
    <class>SessionListView</class>
    <extends>QListView</extends>
@@ -1360,7 +1360,7 @@ padding: 2px;</string>
   <tabstop>add_contact_button</tabstop>
   <tabstop>audio_call_button</tabstop>
   <tabstop>im_session_button</tabstop>
-  <tabstop>ds_session_button</tabstop>
+  <tabstop>ss_session_button</tabstop>
   <tabstop>silent_button</tabstop>
   <tabstop>session_list</tabstop>
   <tabstop>hangup_all_button</tabstop>

resources/incoming_dialog.ui

@@ -280,7 +280,7 @@
          </widget>
         </item>
         <item>
-         <widget class="StreamButton" name="desktopsharing_stream">
+         <widget class="StreamButton" name="screensharing_stream">
           <property name="minimumSize">
            <size>
             <width>26</width>
@@ -302,11 +302,11 @@
           </property>
           <property name="icon">
            <iconset>
-            <normaloff>icons/desktopsharing.png</normaloff>
-            <normalon>icons/desktopsharing-rejected.png</normalon>
-            <disabledoff>icons/desktopsharing.png</disabledoff>
-            <disabledon>icons/desktopsharing-rejected.png</disabledon>
-            <selectedon>icons/desktopsharing-auto-rejected.png</selectedon>icons/desktopsharing.png</iconset>
+            <normaloff>icons/screensharing.png</normaloff>
+            <normalon>icons/screensharing-rejected.png</normalon>
+            <disabledoff>icons/screensharing.png</disabledoff>
+            <disabledon>icons/screensharing-rejected.png</disabledon>
+            <selectedon>icons/screensharing-auto-rejected.png</selectedon>icons/screensharing.png</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -473,7 +473,7 @@
        </spacer>
       </item>
       <item row="3" column="0" colspan="3">
-       <widget class="QLabel" name="desktopsharing_label">
+       <widget class="QLabel" name="screensharing_label">
         <property name="palette">
          <palette>
           <active>
@@ -539,7 +539,7 @@
          </palette>
         </property>
         <property name="text">
-         <string extracomment="is offering to share his desktop">is asking to share your desktop</string>
+         <string extracomment="is offering to share his screen">is asking to share your screen</string>
         </property>
         <property name="indent">
          <number>3</number>

resources/preferences.ui

@@ -2068,7 +2068,7 @@
            <item row="1" column="0" colspan="5">
             <widget class="QCheckBox" name="trace_msrp_button">
              <property name="text">
-              <string>Trace MSRP (used for chat, file transfer and desktop sharing)</string>
+              <string>Trace MSRP (used for chat, file transfer and screen sharing)</string>
              </property>
             </widget>
            </item>