Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vmj-qt
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
vmj-qt
Commits
c27ec4c5
Commit
c27ec4c5
authored
Dec 02, 2014
by
Dan Pascu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorganized preferences
parent
0570b69f
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
304 additions
and
294 deletions
+304
-294
chatwindow.py
blink/chatwindow.py
+2
-2
settings.py
blink/configuration/settings.py
+4
-12
filetransferwindow.py
blink/filetransferwindow.py
+7
-10
mainwindow.py
blink/mainwindow.py
+3
-3
preferences.py
blink/preferences.py
+16
-20
vncviewer.py
blink/screensharing/vncviewer.py
+2
-2
sessions.py
blink/sessions.py
+2
-2
preferences.ui
resources/preferences.ui
+268
-243
No files found.
blink/chatwindow.py
View file @
c27ec4c5
...
@@ -1146,7 +1146,7 @@ class VideoWidget(VideoSurface, ui_class):
...
@@ -1146,7 +1146,7 @@ class VideoWidget(VideoSurface, ui_class):
def
_SH_ScreenshotsFolderActionTriggered
(
self
,
pos
):
def
_SH_ScreenshotsFolderActionTriggered
(
self
,
pos
):
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
settings
.
video
.
screenshots_directory
.
normalized
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
settings
.
screenshots_directory
.
normalized
))
def
_SH_DetachAnimationFinished
(
self
):
def
_SH_DetachAnimationFinished
(
self
):
if
self
.
detach_animation
.
direction
()
==
QPropertyAnimation
.
Backward
:
if
self
.
detach_animation
.
direction
()
==
QPropertyAnimation
.
Backward
:
...
@@ -2155,7 +2155,7 @@ class VideoScreenshot(object):
...
@@ -2155,7 +2155,7 @@ class VideoScreenshot(object):
@
classmethod
@
classmethod
def
filename_generator
(
cls
):
def
filename_generator
(
cls
):
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
name
=
os
.
path
.
join
(
settings
.
video
.
screenshots_directory
.
normalized
,
'VideoCall-{:
%
Y
%
m
%
d-
%
H.
%
M.
%
S}'
.
format
(
datetime
.
now
()))
name
=
os
.
path
.
join
(
settings
.
screenshots_directory
.
normalized
,
'VideoCall-{:
%
Y
%
m
%
d-
%
H.
%
M.
%
S}'
.
format
(
datetime
.
now
()))
yield
'
%
s.png'
%
name
yield
'
%
s.png'
%
name
for
x
in
count
(
1
):
for
x
in
count
(
1
):
yield
"
%
s-
%
d.png"
%
(
name
,
x
)
yield
"
%
s-
%
d.png"
%
(
name
,
x
)
...
...
blink/configuration/settings.py
View file @
c27ec4c5
...
@@ -10,7 +10,7 @@ import sys
...
@@ -10,7 +10,7 @@ import sys
from
sipsimple.configuration
import
Setting
,
SettingsGroup
,
SettingsObject
,
SettingsObjectExtension
from
sipsimple.configuration
import
Setting
,
SettingsGroup
,
SettingsObject
,
SettingsObjectExtension
from
sipsimple.configuration.datatypes
import
AudioCodecList
,
NonNegativeInteger
,
PositiveInteger
,
Path
,
SampleRate
,
VideoCodecList
from
sipsimple.configuration.datatypes
import
AudioCodecList
,
NonNegativeInteger
,
PositiveInteger
,
Path
,
SampleRate
,
VideoCodecList
from
sipsimple.configuration.settings
import
AudioSettings
,
ChatSettings
,
EchoCancellerSettings
,
FileTransferSettings
,
LogsSettings
,
RTPSettings
,
TLSSettings
from
sipsimple.configuration.settings
import
AudioSettings
,
ChatSettings
,
EchoCancellerSettings
,
LogsSettings
,
RTPSettings
,
TLSSettings
from
blink
import
__version__
from
blink
import
__version__
from
blink.configuration.datatypes
import
ApplicationDataPath
,
AuthorizationToken
,
GraphTimeScale
,
HTTPURL
,
IconDescriptor
,
SoundFile
,
PresenceState
,
PresenceStateList
from
blink.configuration.datatypes
import
ApplicationDataPath
,
AuthorizationToken
,
GraphTimeScale
,
HTTPURL
,
IconDescriptor
,
SoundFile
,
PresenceState
,
PresenceStateList
...
@@ -41,10 +41,6 @@ class ChatSettingsExtension(ChatSettings):
...
@@ -41,10 +41,6 @@ class ChatSettingsExtension(ChatSettings):
history_directory
=
Setting
(
type
=
ApplicationDataPath
,
default
=
ApplicationDataPath
(
'history'
))
history_directory
=
Setting
(
type
=
ApplicationDataPath
,
default
=
ApplicationDataPath
(
'history'
))
class
FileTransferSettingsExtension
(
FileTransferSettings
):
directory
=
Setting
(
type
=
Path
,
default
=
Path
(
'~/Downloads'
))
class
GoogleContactsSettings
(
SettingsGroup
):
class
GoogleContactsSettings
(
SettingsGroup
):
authorization_token
=
Setting
(
type
=
AuthorizationToken
,
default
=
None
,
nillable
=
True
)
authorization_token
=
Setting
(
type
=
AuthorizationToken
,
default
=
None
,
nillable
=
True
)
username
=
Setting
(
type
=
unicode
,
default
=
None
,
nillable
=
True
)
username
=
Setting
(
type
=
unicode
,
default
=
None
,
nillable
=
True
)
...
@@ -82,7 +78,6 @@ class SIPSimpleSettingsExtension(SettingsObjectExtension):
...
@@ -82,7 +78,6 @@ class SIPSimpleSettingsExtension(SettingsObjectExtension):
answering_machine
=
AnsweringMachineSettings
answering_machine
=
AnsweringMachineSettings
audio
=
AudioSettingsExtension
audio
=
AudioSettingsExtension
chat
=
ChatSettingsExtension
chat
=
ChatSettingsExtension
file_transfer
=
FileTransferSettingsExtension
google_contacts
=
GoogleContactsSettings
google_contacts
=
GoogleContactsSettings
logs
=
LogsSettingsExtension
logs
=
LogsSettingsExtension
rtp
=
RTPSettingsExtension
rtp
=
RTPSettingsExtension
...
@@ -110,16 +105,11 @@ class ChatWindowSettings(SettingsGroup):
...
@@ -110,16 +105,11 @@ class ChatWindowSettings(SettingsGroup):
class
BlinkScreenSharingSettings
(
SettingsGroup
):
class
BlinkScreenSharingSettings
(
SettingsGroup
):
screenshots_directory
=
Setting
(
type
=
Path
,
default
=
Path
(
'~/Downloads'
))
scale
=
Setting
(
type
=
bool
,
default
=
True
)
scale
=
Setting
(
type
=
bool
,
default
=
True
)
open_fullscreen
=
Setting
(
type
=
bool
,
default
=
False
)
open_fullscreen
=
Setting
(
type
=
bool
,
default
=
False
)
open_viewonly
=
Setting
(
type
=
bool
,
default
=
False
)
open_viewonly
=
Setting
(
type
=
bool
,
default
=
False
)
class
BlinkVideoSettings
(
SettingsGroup
):
screenshots_directory
=
Setting
(
type
=
Path
,
default
=
Path
(
'~/Downloads'
))
class
BlinkPresenceSettings
(
SettingsGroup
):
class
BlinkPresenceSettings
(
SettingsGroup
):
current_state
=
Setting
(
type
=
PresenceState
,
default
=
PresenceState
(
'Available'
))
current_state
=
Setting
(
type
=
PresenceState
,
default
=
PresenceState
(
'Available'
))
state_history
=
Setting
(
type
=
PresenceStateList
,
default
=
PresenceStateList
())
state_history
=
Setting
(
type
=
PresenceStateList
,
default
=
PresenceStateList
())
...
@@ -133,5 +123,7 @@ class BlinkSettings(SettingsObject):
...
@@ -133,5 +123,7 @@ class BlinkSettings(SettingsObject):
chat_window
=
ChatWindowSettings
chat_window
=
ChatWindowSettings
presence
=
BlinkPresenceSettings
presence
=
BlinkPresenceSettings
screen_sharing
=
BlinkScreenSharingSettings
screen_sharing
=
BlinkScreenSharingSettings
video
=
BlinkVideoSettings
screenshots_directory
=
Setting
(
type
=
Path
,
default
=
Path
(
'~/Downloads'
))
transfers_directory
=
Setting
(
type
=
Path
,
default
=
Path
(
'~/Downloads'
))
blink/filetransferwindow.py
View file @
c27ec4c5
...
@@ -14,8 +14,7 @@ from application.python import Null
...
@@ -14,8 +14,7 @@ from application.python import Null
from
application.system
import
makedirs
from
application.system
import
makedirs
from
zope.interface
import
implements
from
zope.interface
import
implements
from
sipsimple.configuration.settings
import
SIPSimpleSettings
from
blink.configuration.settings
import
BlinkSettings
from
blink.resources
import
Resources
from
blink.resources
import
Resources
from
blink.sessions
import
FileTransferDelegate
,
FileTransferModel
from
blink.sessions
import
FileTransferDelegate
,
FileTransferModel
from
blink.widgets.util
import
ContextMenuActions
from
blink.widgets.util
import
ContextMenuActions
...
@@ -43,7 +42,7 @@ class FileTransferWindow(base_class, ui_class):
...
@@ -43,7 +42,7 @@ class FileTransferWindow(base_class, ui_class):
self
.
actions
.
cancel_transfer
=
QAction
(
"Cancel"
,
self
,
triggered
=
self
.
_AH_CancelTransfer
)
self
.
actions
.
cancel_transfer
=
QAction
(
"Cancel"
,
self
,
triggered
=
self
.
_AH_CancelTransfer
)
self
.
actions
.
retry_transfer
=
QAction
(
"Retry"
,
self
,
triggered
=
self
.
_AH_RetryTransfer
)
self
.
actions
.
retry_transfer
=
QAction
(
"Retry"
,
self
,
triggered
=
self
.
_AH_RetryTransfer
)
self
.
actions
.
remove_entry
=
QAction
(
"Remove From List"
,
self
,
triggered
=
self
.
_AH_RemoveEntry
)
self
.
actions
.
remove_entry
=
QAction
(
"Remove From List"
,
self
,
triggered
=
self
.
_AH_RemoveEntry
)
self
.
actions
.
open_downloads_folder
=
QAction
(
"Open
Downloads Folder"
,
self
,
triggered
=
self
.
_AH_OpenDownload
sFolder
)
self
.
actions
.
open_downloads_folder
=
QAction
(
"Open
Transfers Folder"
,
self
,
triggered
=
self
.
_AH_OpenTransfer
sFolder
)
self
.
actions
.
clear_list
=
QAction
(
"Clear List"
,
self
,
triggered
=
self
.
_AH_ClearList
)
self
.
actions
.
clear_list
=
QAction
(
"Clear List"
,
self
,
triggered
=
self
.
_AH_ClearList
)
self
.
model
.
itemAdded
.
connect
(
self
.
update_status
)
self
.
model
.
itemAdded
.
connect
(
self
.
update_status
)
...
@@ -55,9 +54,8 @@ class FileTransferWindow(base_class, ui_class):
...
@@ -55,9 +54,8 @@ class FileTransferWindow(base_class, ui_class):
notification_center
.
add_observer
(
self
,
name
=
'FileTransferDidEnd'
)
notification_center
.
add_observer
(
self
,
name
=
'FileTransferDidEnd'
)
def
show
(
self
,
activate
=
True
):
def
show
(
self
,
activate
=
True
):
settings
=
SIPSimpleSettings
()
settings
=
BlinkSettings
()
directory
=
settings
.
file_transfer
.
directory
.
normalized
makedirs
(
settings
.
transfers_directory
.
normalized
)
makedirs
(
directory
)
self
.
setAttribute
(
Qt
.
WA_ShowWithoutActivating
,
not
activate
)
self
.
setAttribute
(
Qt
.
WA_ShowWithoutActivating
,
not
activate
)
super
(
FileTransferWindow
,
self
)
.
show
()
super
(
FileTransferWindow
,
self
)
.
show
()
self
.
raise_
()
self
.
raise_
()
...
@@ -130,10 +128,9 @@ class FileTransferWindow(base_class, ui_class):
...
@@ -130,10 +128,9 @@ class FileTransferWindow(base_class, ui_class):
item
=
self
.
listview
.
selectedIndexes
()[
0
]
.
data
(
Qt
.
UserRole
)
item
=
self
.
listview
.
selectedIndexes
()[
0
]
.
data
(
Qt
.
UserRole
)
self
.
model
.
removeItem
(
item
)
self
.
model
.
removeItem
(
item
)
def
_AH_OpenDownloadsFolder
(
self
):
def
_AH_OpenTransfersFolder
(
self
):
settings
=
SIPSimpleSettings
()
settings
=
BlinkSettings
()
directory
=
settings
.
file_transfer
.
directory
.
normalized
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
settings
.
transfers_directory
.
normalized
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
def
_AH_ClearList
(
self
):
def
_AH_ClearList
(
self
):
self
.
model
.
clear_ended
()
self
.
model
.
clear_ended
()
...
...
blink/mainwindow.py
View file @
c27ec4c5
...
@@ -416,14 +416,14 @@ class MainWindow(base_class, ui_class):
...
@@ -416,14 +416,14 @@ class MainWindow(base_class, ui_class):
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
def
_AH_ReceivedFilesWindowActionTriggered
(
self
,
checked
):
def
_AH_ReceivedFilesWindowActionTriggered
(
self
,
checked
):
settings
=
SIPSimple
Settings
()
settings
=
Blink
Settings
()
directory
=
settings
.
file_transfer
.
directory
.
normalized
directory
=
settings
.
transfers_
directory
.
normalized
makedirs
(
directory
)
makedirs
(
directory
)
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
def
_AH_ScreenshotsWindowActionTriggered
(
self
,
checked
):
def
_AH_ScreenshotsWindowActionTriggered
(
self
,
checked
):
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
directory
=
settings
.
screen
_sharing
.
screen
shots_directory
.
normalized
directory
=
settings
.
screenshots_directory
.
normalized
makedirs
(
directory
)
makedirs
(
directory
)
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
directory
))
...
...
blink/preferences.py
View file @
c27ec4c5
...
@@ -303,14 +303,10 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -303,14 +303,10 @@ class PreferencesWindow(base_class, ui_class):
self
.
traffic_units_button
.
clicked
.
connect
(
self
.
_SH_TrafficUnitsButtonClicked
)
self
.
traffic_units_button
.
clicked
.
connect
(
self
.
_SH_TrafficUnitsButtonClicked
)
# Screen sharing
# Screen sharing
self
.
screenshots_directory_browse_button
.
clicked
.
connect
(
self
.
_SH_ScreenshotsDirectoryBrowseButtonClicked
)
self
.
screen_sharing_scale_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingScaleButtonClicked
)
self
.
screen_sharing_scale_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingScaleButtonClicked
)
self
.
screen_sharing_fullscreen_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingFullscreenButtonClicked
)
self
.
screen_sharing_fullscreen_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingFullscreenButtonClicked
)
self
.
screen_sharing_viewonly_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingViewonlyButtonClicked
)
self
.
screen_sharing_viewonly_button
.
clicked
.
connect
(
self
.
_SH_ScreenSharingViewonlyButtonClicked
)
# File transfer
self
.
download_directory_browse_button
.
clicked
.
connect
(
self
.
_SH_DownloadDirectoryBrowseButtonClicked
)
# File logging
# File logging
self
.
trace_sip_button
.
clicked
.
connect
(
self
.
_SH_TraceSIPButtonClicked
)
self
.
trace_sip_button
.
clicked
.
connect
(
self
.
_SH_TraceSIPButtonClicked
)
self
.
trace_msrp_button
.
clicked
.
connect
(
self
.
_SH_TraceMSRPButtonClicked
)
self
.
trace_msrp_button
.
clicked
.
connect
(
self
.
_SH_TraceMSRPButtonClicked
)
...
@@ -328,7 +324,11 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -328,7 +324,11 @@ class PreferencesWindow(base_class, ui_class):
self
.
media_ports_start
.
valueChanged
[
int
]
.
connect
(
self
.
_SH_MediaPortsStartValueChanged
)
self
.
media_ports_start
.
valueChanged
[
int
]
.
connect
(
self
.
_SH_MediaPortsStartValueChanged
)
self
.
media_ports
.
valueChanged
[
int
]
.
connect
(
self
.
_SH_MediaPortsValueChanged
)
self
.
media_ports
.
valueChanged
[
int
]
.
connect
(
self
.
_SH_MediaPortsValueChanged
)
# TLS
# Files and directories
self
.
screenshots_directory_browse_button
.
clicked
.
connect
(
self
.
_SH_ScreenshotsDirectoryBrowseButtonClicked
)
self
.
transfers_directory_browse_button
.
clicked
.
connect
(
self
.
_SH_TransfersDirectoryBrowseButtonClicked
)
# TLS settings
self
.
tls_ca_file_editor
.
locationCleared
.
connect
(
self
.
_SH_TLSCAFileEditorLocationCleared
)
self
.
tls_ca_file_editor
.
locationCleared
.
connect
(
self
.
_SH_TLSCAFileEditorLocationCleared
)
self
.
tls_ca_file_browse_button
.
clicked
.
connect
(
self
.
_SH_TLSCAFileBrowseButtonClicked
)
self
.
tls_ca_file_browse_button
.
clicked
.
connect
(
self
.
_SH_TLSCAFileBrowseButtonClicked
)
...
@@ -713,14 +713,10 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -713,14 +713,10 @@ class PreferencesWindow(base_class, ui_class):
self
.
traffic_units_button
.
setChecked
(
blink_settings
.
chat_window
.
session_info
.
bytes_per_second
)
self
.
traffic_units_button
.
setChecked
(
blink_settings
.
chat_window
.
session_info
.
bytes_per_second
)
# Screen sharing settings
# Screen sharing settings
self
.
screenshots_directory_editor
.
setText
(
blink_settings
.
screen_sharing
.
screenshots_directory
or
u''
)
self
.
screen_sharing_scale_button
.
setChecked
(
blink_settings
.
screen_sharing
.
scale
)
self
.
screen_sharing_scale_button
.
setChecked
(
blink_settings
.
screen_sharing
.
scale
)
self
.
screen_sharing_fullscreen_button
.
setChecked
(
blink_settings
.
screen_sharing
.
open_fullscreen
)
self
.
screen_sharing_fullscreen_button
.
setChecked
(
blink_settings
.
screen_sharing
.
open_fullscreen
)
self
.
screen_sharing_viewonly_button
.
setChecked
(
blink_settings
.
screen_sharing
.
open_viewonly
)
self
.
screen_sharing_viewonly_button
.
setChecked
(
blink_settings
.
screen_sharing
.
open_viewonly
)
# File transfer settings
self
.
download_directory_editor
.
setText
(
settings
.
file_transfer
.
directory
or
u''
)
# File logging settings
# File logging settings
self
.
trace_sip_button
.
setChecked
(
settings
.
logs
.
trace_sip
)
self
.
trace_sip_button
.
setChecked
(
settings
.
logs
.
trace_sip
)
self
.
trace_msrp_button
.
setChecked
(
settings
.
logs
.
trace_msrp
)
self
.
trace_msrp_button
.
setChecked
(
settings
.
logs
.
trace_msrp
)
...
@@ -750,6 +746,8 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -750,6 +746,8 @@ class PreferencesWindow(base_class, ui_class):
with
blocked_qt_signals
(
self
.
media_ports
):
with
blocked_qt_signals
(
self
.
media_ports
):
self
.
media_ports
.
setValue
(
settings
.
rtp
.
port_range
.
end
-
settings
.
rtp
.
port_range
.
start
)
self
.
media_ports
.
setValue
(
settings
.
rtp
.
port_range
.
end
-
settings
.
rtp
.
port_range
.
start
)
self
.
screenshots_directory_editor
.
setText
(
blink_settings
.
screenshots_directory
or
u''
)
self
.
transfers_directory_editor
.
setText
(
blink_settings
.
transfers_directory
or
u''
)
self
.
tls_ca_file_editor
.
setText
(
settings
.
tls
.
ca_list
or
u''
)
self
.
tls_ca_file_editor
.
setText
(
settings
.
tls
.
ca_list
or
u''
)
def
load_account_settings
(
self
,
account
):
def
load_account_settings
(
self
,
account
):
...
@@ -1499,13 +1497,12 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -1499,13 +1497,12 @@ class PreferencesWindow(base_class, ui_class):
def
_SH_ScreenshotsDirectoryBrowseButtonClicked
(
self
,
checked
):
def
_SH_ScreenshotsDirectoryBrowseButtonClicked
(
self
,
checked
):
# TODO: open the file selection dialog in non-modal mode. Same for the one for TLS CA list and the IconSelector from contacts. -Dan
# TODO: open the file selection dialog in non-modal mode. Same for the one for TLS CA list and the IconSelector from contacts. -Dan
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
directory
=
settings
.
screen_sharing
.
screenshots_directory
.
normalized
directory
=
QFileDialog
.
getExistingDirectory
(
self
,
u'Select Screenshots Directory'
,
settings
.
screenshots_directory
.
normalized
)
or
None
directory
=
QFileDialog
.
getExistingDirectory
(
self
,
u'Select Screenshots Directory'
,
directory
)
or
None
if
directory
is
not
None
:
if
directory
is
not
None
:
directory
=
os
.
path
.
normpath
(
directory
)
directory
=
os
.
path
.
normpath
(
directory
)
if
directory
!=
settings
.
screen
_sharing
.
screen
shots_directory
:
if
directory
!=
settings
.
screenshots_directory
:
self
.
screenshots_directory_editor
.
setText
(
directory
)
self
.
screenshots_directory_editor
.
setText
(
directory
)
settings
.
screen
_sharing
.
screen
shots_directory
=
directory
settings
.
screenshots_directory
=
directory
settings
.
save
()
settings
.
save
()
def
_SH_ScreenSharingScaleButtonClicked
(
self
,
checked
):
def
_SH_ScreenSharingScaleButtonClicked
(
self
,
checked
):
...
@@ -1524,16 +1521,15 @@ class PreferencesWindow(base_class, ui_class):
...
@@ -1524,16 +1521,15 @@ class PreferencesWindow(base_class, ui_class):
settings
.
save
()
settings
.
save
()
# File transfer signal handlers
# File transfer signal handlers
def
_SH_
Download
DirectoryBrowseButtonClicked
(
self
,
checked
):
def
_SH_
Transfers
DirectoryBrowseButtonClicked
(
self
,
checked
):
# TODO: open the file selection dialog in non-modal mode. Same for the one for TLS CA list and the IconSelector from contacts. -Dan
# TODO: open the file selection dialog in non-modal mode. Same for the one for TLS CA list and the IconSelector from contacts. -Dan
settings
=
SIPSimpleSettings
()
settings
=
BlinkSettings
()
directory
=
settings
.
file_transfer
.
directory
.
normalized
directory
=
QFileDialog
.
getExistingDirectory
(
self
,
u'Select Transfers Directory'
,
settings
.
transfers_directory
.
normalized
)
or
None
directory
=
QFileDialog
.
getExistingDirectory
(
self
,
u'Select Download Directory'
,
directory
)
or
None
if
directory
is
not
None
:
if
directory
is
not
None
:
directory
=
os
.
path
.
normpath
(
directory
)
directory
=
os
.
path
.
normpath
(
directory
)
if
directory
!=
settings
.
file_transfer
.
directory
:
if
directory
!=
settings
.
transfers_
directory
:
self
.
download
_directory_editor
.
setText
(
directory
)
self
.
transfers
_directory_editor
.
setText
(
directory
)
settings
.
file_transfer
.
directory
=
directory
settings
.
transfers_
directory
=
directory
settings
.
save
()
settings
.
save
()
# File logging signal handlers
# File logging signal handlers
...
...
blink/screensharing/vncviewer.py
View file @
c27ec4c5
...
@@ -653,7 +653,7 @@ class ScreensharingWindow(base_class, ui_class):
...
@@ -653,7 +653,7 @@ class ScreensharingWindow(base_class, ui_class):
def
_SH_ScreenshotsFolderActionTriggered
(
self
,
pos
):
def
_SH_ScreenshotsFolderActionTriggered
(
self
,
pos
):
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
settings
.
screen
_sharing
.
screen
shots_directory
.
normalized
))
QDesktopServices
.
openUrl
(
QUrl
.
fromLocalFile
(
settings
.
screenshots_directory
.
normalized
))
def
_SH_VNCClientTextCut
(
self
,
text
):
def
_SH_VNCClientTextCut
(
self
,
text
):
self
.
clipboard
.
blockSignals
(
True
)
self
.
clipboard
.
blockSignals
(
True
)
...
@@ -675,7 +675,7 @@ class Screenshot(object):
...
@@ -675,7 +675,7 @@ class Screenshot(object):
@
classmethod
@
classmethod
def
filename_generator
(
cls
):
def
filename_generator
(
cls
):
settings
=
BlinkSettings
()
settings
=
BlinkSettings
()
name
=
os
.
path
.
join
(
settings
.
screen
_sharing
.
screen
shots_directory
.
normalized
,
'ScreenSharing-{:
%
Y
%
m
%
d-
%
H.
%
M.
%
S}'
.
format
(
datetime
.
now
()))
name
=
os
.
path
.
join
(
settings
.
screenshots_directory
.
normalized
,
'ScreenSharing-{:
%
Y
%
m
%
d-
%
H.
%
M.
%
S}'
.
format
(
datetime
.
now
()))
yield
'
%
s.png'
%
name
yield
'
%
s.png'
%
name
for
x
in
count
(
1
):
for
x
in
count
(
1
):
yield
"
%
s-
%
d.png"
%
(
name
,
x
)
yield
"
%
s-
%
d.png"
%
(
name
,
x
)
...
...
blink/sessions.py
View file @
c27ec4c5
...
@@ -3458,8 +3458,8 @@ class FileTransfer(object):
...
@@ -3458,8 +3458,8 @@ class FileTransfer(object):
self
.
_file_selector
=
stream
.
file_selector
self
.
_file_selector
=
stream
.
file_selector
self
.
_local_hash
=
hashlib
.
sha1
()
self
.
_local_hash
=
hashlib
.
sha1
()
settings
=
SIPSimple
Settings
()
settings
=
Blink
Settings
()
directory
=
settings
.
file_transfer
.
directory
.
normalized
directory
=
settings
.
transfers_
directory
.
normalized
makedirs
(
directory
)
makedirs
(
directory
)
filename
=
os
.
path
.
basename
(
self
.
_file_selector
.
name
)
filename
=
os
.
path
.
basename
(
self
.
_file_selector
.
name
)
for
name
in
UniqueFilenameGenerator
.
generate
(
os
.
path
.
join
(
directory
,
filename
)):
for
name
in
UniqueFilenameGenerator
.
generate
(
os
.
path
.
join
(
directory
,
filename
)):
...
...
resources/preferences.ui
View file @
c27ec4c5
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment