dialogs/DiscoveryDialog.py
author Andrey Skvortsov <andrej.skvortzov@gmail.com>
Mon, 19 Jun 2017 18:49:43 +0300
changeset 1696 8043f32de7b8
parent 1571 486f94a8032c
child 1730 64d8f52bc8c8
permissions -rw-r--r--
make all dialog have non-fixed size

this fixes the problem, that some controls may be hidden in some cases, because
dialog size is too small. This can happen when system fonts are bigger
than expected, default system them controls are bigger or if localized
strings are bigger than in English.
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     1
#!/usr/bin/env python
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     2
# -*- coding: utf-8 -*-
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
     3
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     4
# This file is part of Beremiz, a Integrated Development Environment for
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     5
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     6
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     7
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
     8
# Copyright (C) 2017: Andrey Skvortsov <andrej.skvortzov@gmail.com>
1571
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
     9
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    10
# See COPYING file for copyrights details.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    11
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    12
# This program is free software; you can redistribute it and/or
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    13
# modify it under the terms of the GNU General Public License
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    14
# as published by the Free Software Foundation; either version 2
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    15
# of the License, or (at your option) any later version.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    16
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    17
# This program is distributed in the hope that it will be useful,
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    18
# but WITHOUT ANY WARRANTY; without even the implied warranty of
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    19
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    20
# GNU General Public License for more details.
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    21
#
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    22
# You should have received a copy of the GNU General Public License
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    23
# along with this program; if not, write to the Free Software
486f94a8032c fix license notices in source files and license files under GPLv2+
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1495
diff changeset
    24
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    25
399
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 392
diff changeset
    26
import socket
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    27
import wx
399
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 392
diff changeset
    28
import  wx.lib.mixins.listctrl  as  listmix
726
ae63ccc29444 refactoring
Edouard Tisserant
parents: 644
diff changeset
    29
from util.Zeroconf import *
399
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 392
diff changeset
    30
77e23bf04c33 Merging some improvements from BCT
laurent
parents: 392
diff changeset
    31
import connectors
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    32
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    33
service_type = '_PYRO._tcp.local.'
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    34
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
    35
class AutoWidthListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    36
    def __init__(self, parent, id, name, pos=wx.DefaultPosition,
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    37
                 size=wx.DefaultSize, style=0):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    38
        wx.ListCtrl.__init__(self, parent, id, pos, size, style, name=name)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    39
        listmix.ListCtrlAutoWidthMixin.__init__(self)
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    40
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    41
[ID_DISCOVERYDIALOG, ID_DISCOVERYDIALOGSTATICTEXT1, 
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    42
 ID_DISCOVERYDIALOGSERVICESLIST, ID_DISCOVERYDIALOGREFRESHBUTTON, 
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    43
 ID_DISCOVERYDIALOGLOCALBUTTON, ID_DISCOVERYDIALOGIPBUTTON, 
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    44
] = [wx.NewId() for _init_ctrls in range(6)]
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    45
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
    46
class DiscoveryDialog(wx.Dialog, listmix.ColumnSorterMixin):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    47
    
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    48
    def _init_coll_MainSizer_Items(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    49
        parent.AddWindow(self.staticText1, 0, border=20, flag=wx.TOP|wx.LEFT|wx.RIGHT|wx.GROW)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    50
        parent.AddWindow(self.ServicesList, 0, border=20, flag=wx.LEFT|wx.RIGHT|wx.GROW)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    51
        parent.AddSizer(self.ButtonGridSizer, 0, border=20, flag=wx.LEFT|wx.RIGHT|wx.BOTTOM|wx.GROW)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    52
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    53
    def _init_coll_MainSizer_Growables(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    54
        parent.AddGrowableCol(0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    55
        parent.AddGrowableRow(1)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    56
    
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    57
    def _init_coll_ButtonGridSizer_Items(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    58
        parent.AddWindow(self.RefreshButton, 0, border=0, flag=0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    59
        parent.AddWindow(self.LocalButton, 0, border=0, flag=0)
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    60
        parent.AddWindow(self.IpButton, 0, border=0, flag=0)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    61
        parent.AddSizer(self.ButtonSizer, 0, border=0, flag=0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    62
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    63
    def _init_coll_ButtonGridSizer_Growables(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    64
        parent.AddGrowableCol(0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    65
        parent.AddGrowableCol(1)
1494
00910a8572d9 fix wrong Row number in DiscoveryDialog.py that caused following traceback:
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 814
diff changeset
    66
        parent.AddGrowableRow(0)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    67
    
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    68
    def _init_sizers(self):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    69
        self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=10)
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
    70
        self.ButtonGridSizer = wx.FlexGridSizer(cols=4, hgap=5, rows=1, vgap=0)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    71
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    72
        self._init_coll_MainSizer_Items(self.MainSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    73
        self._init_coll_MainSizer_Growables(self.MainSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    74
        self._init_coll_ButtonGridSizer_Items(self.ButtonGridSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    75
        self._init_coll_ButtonGridSizer_Growables(self.ButtonGridSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    76
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    77
        self.SetSizer(self.MainSizer)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    78
    
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    79
    def _init_ctrls(self, prnt):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    80
        wx.Dialog.__init__(self, id=ID_DISCOVERYDIALOG, 
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
    81
              name='DiscoveryDialog', parent=prnt, style=wx.DEFAULT_DIALOG_STYLE,
1495
078047c3ab85 add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1494
diff changeset
    82
              title=_('Service Discovery'))
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    83
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    84
        self.staticText1 = wx.StaticText(id=ID_DISCOVERYDIALOGSTATICTEXT1,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    85
              label=_('Services available:'), name='staticText1', parent=self,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    86
              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    87
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    88
        # Set up list control
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    89
        self.ServicesList = AutoWidthListCtrl(id=ID_DISCOVERYDIALOGSERVICESLIST,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    90
              name='ServicesList', parent=self, pos=wx.Point(0, 0), size=wx.Size(0, 0), 
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    91
              style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_SORT_ASCENDING|wx.LC_SINGLE_SEL)
1495
078047c3ab85 add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1494
diff changeset
    92
        self.ServicesList.InsertColumn(0, _('NAME'))
078047c3ab85 add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1494
diff changeset
    93
        self.ServicesList.InsertColumn(1, _('TYPE'))
078047c3ab85 add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1494
diff changeset
    94
        self.ServicesList.InsertColumn(2, _('IP'))
078047c3ab85 add i18n for some strings in DiscoveryDialog, DurationEditDialog, ProjectDialog and CodeFileEditor
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1494
diff changeset
    95
        self.ServicesList.InsertColumn(3, _('PORT'))
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    96
        self.ServicesList.SetColumnWidth(0, 150)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    97
        self.ServicesList.SetColumnWidth(1, 150)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    98
        self.ServicesList.SetColumnWidth(2, 150)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
    99
        self.ServicesList.SetColumnWidth(3, 150)
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
   100
        self.ServicesList.SetInitialSize(wx.Size(-1, 300))
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   101
        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, id=ID_DISCOVERYDIALOGSERVICESLIST)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   102
        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated, id=ID_DISCOVERYDIALOGSERVICESLIST)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   103
        
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   104
        listmix.ColumnSorterMixin.__init__(self, 4)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   105
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   106
        self.RefreshButton = wx.Button(id=ID_DISCOVERYDIALOGREFRESHBUTTON,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   107
              label=_('Refresh'), name='RefreshButton', parent=self,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   108
              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   109
        self.Bind(wx.EVT_BUTTON, self.OnRefreshButton, id=ID_DISCOVERYDIALOGREFRESHBUTTON)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   110
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   111
        self.LocalButton = wx.Button(id=ID_DISCOVERYDIALOGLOCALBUTTON,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   112
              label=_('Local'), name='LocalButton', parent=self,
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   113
              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   114
        self.Bind(wx.EVT_BUTTON, self.OnLocalButton, id=ID_DISCOVERYDIALOGLOCALBUTTON)
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   115
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   116
        self.IpButton = wx.Button(id=ID_DISCOVERYDIALOGIPBUTTON,
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   117
              label=_('Add IP'), name='IpButton', parent=self,
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   118
              pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   119
        self.Bind(wx.EVT_BUTTON, self.OnIpButton, id=ID_DISCOVERYDIALOGIPBUTTON)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   120
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   121
        self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTER)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   122
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   123
        self._init_sizers()
1696
8043f32de7b8 make all dialog have non-fixed size
Andrey Skvortsov <andrej.skvortzov@gmail.com>
parents: 1571
diff changeset
   124
        self.Fit()
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   125
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   126
    def __init__(self, parent):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   127
        self._init_ctrls(parent)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   128
        
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   129
        self.itemDataMap = {}
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   130
        self.nextItemId = 0
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   131
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   132
        self.URI = None
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   133
        self.Browser = None
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   134
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   135
        self.ZeroConfInstance = Zeroconf()
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   136
        self.RefreshList()
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   137
        self.LatestSelection=None
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   138
        
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   139
    def __del__(self):
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   140
        if self.Browser is not None : self.Browser.cancel()
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   141
        self.ZeroConfInstance.close()
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   142
        
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   143
    def RefreshList(self):
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   144
        if self.Browser is not None : self.Browser.cancel()
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   145
        self.Browser = ServiceBrowser(self.ZeroConfInstance, service_type, self)
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   146
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   147
    def OnRefreshButton(self, event):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   148
        self.ServicesList.DeleteAllItems()
221
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   149
        self.RefreshList()
451bb2c1d157 Rewritten horrible discovery.py.
etisserant
parents: 203
diff changeset
   150
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   151
    def OnLocalButton(self, event):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   152
        self.URI = "LOCAL://"
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   153
        self.EndModal(wx.ID_OK)
357
19db1076e93c close ZeroConf object when exiting the Service Discovery window.
btaylor@grond.willowglen.ab.ca
parents: 277
diff changeset
   154
        event.Skip()
19db1076e93c close ZeroConf object when exiting the Service Discovery window.
btaylor@grond.willowglen.ab.ca
parents: 277
diff changeset
   155
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   156
    def OnIpButton(self, event):
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   157
        if self.LatestSelection is not None:
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   158
            l = lambda col : self.getColumnText(self.LatestSelection,col)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   159
            self.URI = "%s://%s:%s"%tuple(map(l,(1,2,3)))
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   160
            self.EndModal(wx.ID_OK)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   161
        event.Skip()
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   162
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   163
    # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   164
    def GetListCtrl(self):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   165
        return self.ServicesList
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   166
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   167
    def getColumnText(self, index, col):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   168
        item = self.ServicesList.GetItem(index, col)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   169
        return item.GetText()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   170
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   171
    def OnItemSelected(self, event):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   172
        self.SetURI(event.m_itemIndex)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   173
        event.Skip()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   174
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   175
    def OnItemActivated(self, event):
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   176
        self.SetURI(event.m_itemIndex)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   177
        self.EndModal(wx.ID_OK)
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   178
        event.Skip()
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   179
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   180
#    def SetURI(self, idx):
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   181
#        connect_type = self.getColumnText(idx, 1)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   182
#        connect_address = self.getColumnText(idx, 2)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   183
#        connect_port = self.getColumnText(idx, 3)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   184
#        
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   185
#        self.URI = "%s://%s:%s"%(connect_type, connect_address, connect_port)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   186
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   187
    def SetURI(self, idx):
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   188
        self.LatestSelection = idx
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   189
        svcname = self.getColumnText(idx, 0) 
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   190
        connect_type = self.getColumnText(idx, 1)
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   191
        self.URI = "%s://%s"%(connect_type, svcname + '.' + service_type)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   192
        
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   193
    def GetURI(self):
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   194
        return self.URI
203
cb9901076a21 Added concepts :
etisserant
parents:
diff changeset
   195
        
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   196
    def removeService(self, zeroconf, _type, name):
644
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   197
        wx.CallAfter(self._removeService, name)
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   198
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   199
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   200
    def _removeService(self, name):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   201
        '''
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   202
        called when a service with the desired type goes offline.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   203
        '''
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   204
        
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   205
        # loop through the list items looking for the service that went offline
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   206
        for idx in xrange(self.ServicesList.GetItemCount()):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   207
            # this is the unique identifier assigned to the item
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   208
            item_id = self.ServicesList.GetItemData(idx)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   209
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   210
            # this is the full typename that was received by addService
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   211
            item_name = self.itemDataMap[item_id][4]
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   212
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   213
            if item_name == name:
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   214
                self.ServicesList.DeleteItem(idx)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   215
                break
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   216
        
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   217
    def addService(self, zeroconf, _type, name):
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   218
        wx.CallAfter(self._addService, _type, name)
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   219
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   220
    def _addService(self, _type, name):
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   221
        '''
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   222
        called when a service with the desired type is discovered.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   223
        '''
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   224
        info = self.ZeroConfInstance.getServiceInfo(_type, name)
374
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   225
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   226
        svcname  = name.split(".")[0]
763
c1104099c151 Now, PYRO:// locations also accept MDNS service names
Edouard Tisserant
parents: 726
diff changeset
   227
        typename = _type.split(".")[0][1:]
374
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   228
        ip       = str(socket.inet_ntoa(info.getAddress()))
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   229
        port     = info.getPort()
8787fa8c6792 bugfix: On Windows, sometimes the the wrong line in the service discovery list control is updated when multiple services are displayed and a new service is discovered.
b.taylor@willowglen.ca
parents: 357
diff changeset
   230
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   231
        num_items = self.ServicesList.GetItemCount()
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   232
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   233
        # display the new data in the list
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   234
        new_item = self.ServicesList.InsertStringItem(num_items, svcname)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   235
        self.ServicesList.SetStringItem(new_item, 1, "%s" % typename)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   236
        self.ServicesList.SetStringItem(new_item, 2, "%s" % ip)
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   237
        self.ServicesList.SetStringItem(new_item, 3, "%s" % port)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   238
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   239
        # record the new data for the ColumnSorterMixin
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   240
        # we assign every list item a unique id (that won't change when items
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   241
        # are added or removed)
392
6617d3fb43e2 Redesign DiscoveryDialog class to conform to others dialogs
laurent
parents: 379
diff changeset
   242
        self.ServicesList.SetItemData(new_item, self.nextItemId)
375
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   243
 
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   244
        # the value of each column has to be stored in the itemDataMap
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   245
        # so that ColumnSorterMixin knows how to sort the column.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   246
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   247
        # "name" is included at the end so that self.removeService
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   248
        # can access it.
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   249
        self.itemDataMap[self.nextItemId] = [ svcname, typename, ip, port, name ]
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   250
b16bcfe531d7 fix discovery dialog sorting, remove services from the discovery dialog when they go offline
b.taylor@willowglen.ca
parents: 374
diff changeset
   251
        self.nextItemId += 1
644
b511cab580eb Better naming of IP address related variables in Beremiz_service.py, Ignore errors that occur on shutdown in Zeroconf.py, fixed discovery dialog crash due to asynchronous call from zeroconf
Edouard Tisserant
parents: 399
diff changeset
   252