Switch the order of imports: try the 1.8 modules first.
This commit is contained in:
parent
e8daecad3c
commit
17ad3510aa
|
@ -27,16 +27,6 @@ from datetime import timedelta
|
|||
import libtorrent as lt
|
||||
|
||||
try:
|
||||
from evas import EVAS_ASPECT_CONTROL_VERTICAL, Rectangle
|
||||
from ecore import Timer
|
||||
import elementary as elm
|
||||
from elementary import Genlist, GenlistItemClass, StandardWindow, Icon, \
|
||||
Box, Label, Button, ELM_GENLIST_ITEM_FIELD_TEXT, \
|
||||
ELM_GENLIST_ITEM_FIELD_CONTENT, InnerWindow, Frame, \
|
||||
Fileselector, Entry, Panel, ELM_PANEL_ORIENT_BOTTOM, \
|
||||
ELM_OBJECT_SELECT_MODE_NONE, Table, Separator, Menu, Configuration, \
|
||||
ELM_LIST_COMPRESS, Toolbar
|
||||
except ImportError:
|
||||
from efl.evas import EVAS_ASPECT_CONTROL_VERTICAL, Rectangle
|
||||
from efl.ecore import Timer
|
||||
from efl import elementary as elm
|
||||
|
@ -58,7 +48,18 @@ except ImportError:
|
|||
from efl.elementary.separator import Separator
|
||||
from efl.elementary.menu import Menu
|
||||
from efl.elementary.configuration import Configuration
|
||||
from efl.elementary.toolbar import Toolbar
|
||||
from efl.elementary.toolbar import Toolbar, ELM_TOOLBAR_SHRINK_NONE, \
|
||||
ELM_OBJECT_SELECT_MODE_NONE
|
||||
except ImportError:
|
||||
from evas import EVAS_ASPECT_CONTROL_VERTICAL, Rectangle
|
||||
from ecore import Timer
|
||||
import elementary as elm
|
||||
from elementary import Genlist, GenlistItemClass, StandardWindow, Icon, \
|
||||
Box, Label, Button, ELM_GENLIST_ITEM_FIELD_TEXT, \
|
||||
ELM_GENLIST_ITEM_FIELD_CONTENT, InnerWindow, Frame, \
|
||||
Fileselector, Entry, Panel, ELM_PANEL_ORIENT_BOTTOM, \
|
||||
ELM_OBJECT_SELECT_MODE_NONE, Table, Separator, Menu, Configuration, \
|
||||
ELM_LIST_COMPRESS, Toolbar
|
||||
|
||||
from TorrentInfo import TorrentInfo
|
||||
from Preferences import PreferencesGeneral, PreferencesProxy, PreferencesSession
|
||||
|
@ -90,8 +91,8 @@ class MainInterface(object):
|
|||
|
||||
tb = Toolbar(win)
|
||||
tb.homogeneous = False
|
||||
tb.shrink_mode = elm.toolbar.ELM_TOOLBAR_SHRINK_NONE
|
||||
tb.select_mode = elm.toolbar.ELM_OBJECT_SELECT_MODE_NONE
|
||||
tb.shrink_mode = ELM_TOOLBAR_SHRINK_NONE
|
||||
tb.select_mode = ELM_OBJECT_SELECT_MODE_NONE
|
||||
tb.size_hint_align = -1.0, 0.0
|
||||
tb.menu_parent = win
|
||||
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
#
|
||||
|
||||
try:
|
||||
from elementary import Label, Notify, Popup, Button
|
||||
except ImportError:
|
||||
from efl.elementary.label import Label
|
||||
from efl.elementary.notify import Notify
|
||||
from efl.elementary.popup import Popup
|
||||
from efl.elementary.button import Button
|
||||
except ImportError:
|
||||
from elementary import Label, Notify, Popup, Button
|
||||
|
||||
class Information(object):
|
||||
def __init__(self, canvas, text):
|
||||
|
|
|
@ -27,16 +27,6 @@ log = logging.getLogger("epour")
|
|||
import libtorrent as lt
|
||||
|
||||
try:
|
||||
from elementary import Icon, Box, Label, Button, \
|
||||
Popup, Frame, Entry, Check, Spinner, Hoversel, \
|
||||
FileselectorButton, Scroller, ELM_SCROLLER_POLICY_OFF, \
|
||||
ELM_SCROLLER_POLICY_AUTO, Separator, Slider, Actionslider, \
|
||||
ELM_ACTIONSLIDER_LEFT, ELM_ACTIONSLIDER_CENTER, \
|
||||
ELM_ACTIONSLIDER_RIGHT, ELM_ACTIONSLIDER_ALL, \
|
||||
Naviframe, Table, Configuration
|
||||
from evas import Rectangle
|
||||
from ecore import Timer
|
||||
except ImportError:
|
||||
from efl.elementary.icon import Icon
|
||||
from efl.elementary.box import Box
|
||||
from efl.elementary.label import Label
|
||||
|
@ -60,6 +50,16 @@ except ImportError:
|
|||
from efl.elementary.configuration import Configuration
|
||||
from efl.evas import Rectangle
|
||||
from efl.ecore import Timer
|
||||
except ImportError:
|
||||
from elementary import Icon, Box, Label, Button, \
|
||||
Popup, Frame, Entry, Check, Spinner, Hoversel, \
|
||||
FileselectorButton, Scroller, ELM_SCROLLER_POLICY_OFF, \
|
||||
ELM_SCROLLER_POLICY_AUTO, Separator, Slider, Actionslider, \
|
||||
ELM_ACTIONSLIDER_LEFT, ELM_ACTIONSLIDER_CENTER, \
|
||||
ELM_ACTIONSLIDER_RIGHT, ELM_ACTIONSLIDER_ALL, \
|
||||
Naviframe, Table, Configuration
|
||||
from evas import Rectangle
|
||||
from ecore import Timer
|
||||
|
||||
import Notify
|
||||
|
||||
|
|
|
@ -28,8 +28,6 @@ log = logging.getLogger("epour")
|
|||
import libtorrent as lt
|
||||
|
||||
try:
|
||||
import elementary as elm
|
||||
except ImportError:
|
||||
from efl import ecore
|
||||
from efl.elementary.genlist import Genlist, GenlistItemClass
|
||||
from efl.elementary.innerwindow import InnerWindow
|
||||
|
@ -42,7 +40,7 @@ except ImportError:
|
|||
from efl.elementary.naviframe import Naviframe
|
||||
from efl.elementary.frame import Frame
|
||||
from efl.elementary.object import ELM_SEL_FORMAT_TEXT, ELM_SEL_TYPE_CLIPBOARD
|
||||
else:
|
||||
except ImportError:
|
||||
import ecore
|
||||
from elementary import Genlist, GenlistItemClass, InnerWindow, Button, \
|
||||
Box, Hoversel, Check, Label, ELM_WRAP_CHAR, ELM_WRAP_WORD, Entry, \
|
||||
|
|
Loading…
Reference in New Issue