Skip to content

Commit

Permalink
Now widgets are place in their own module
Browse files Browse the repository at this point in the history
  • Loading branch information
tpoveda committed Aug 18, 2020
1 parent 5338e69 commit 2c20fa8
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 70 deletions.
8 changes: 4 additions & 4 deletions artella/plugins/getdependencies/getdependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,9 @@ def _show_get_deps_dialog(self, deps):
:return: True if the user acceps the operation; False otherwise
"""

from artella.plugins.getdependencies import widgets
from artella.plugins.getdependencies.widgets import listdialog

deps_dialog = widgets.DependenciesListDialog()
deps_dialog = listdialog.DependenciesListDialog()
title = 'Artella - Missing dependency' if len(deps) <= 1 else 'Artella - Missing dependencies'
deps_dialog.setWindowTitle(title)
deps_dialog.set_dependencies(deps)
Expand All @@ -245,9 +245,9 @@ def _show_get_deps_result_dialog(self, deps_list):
if not deps_list:
return

from artella.plugins.getdependencies import widgets
from artella.plugins.getdependencies.widgets import outputdialog

deps_dialog = widgets.DependenciesOutputDialog()
deps_dialog = outputdialog.DependenciesOutputDialog()
for dep in deps_list:
for dep_parent_path, dep_paths in dep.items():
if dep_paths:
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
# -*- coding: utf-8 -*-

"""
Module that contains Artella Get Dependencies custom widgets
Module that contains List Dialog Artella Get Dependencies widget implementation
"""

from __future__ import print_function, division, absolute_import

import os

import artella
from artella.core import qtutils

if qtutils.QT_AVAILABLE:
from artella.externals.Qt import QtCore, QtWidgets, QtGui
from artella.externals.Qt import QtCore, QtWidgets


class DependenciesListDialog(artella.Dialog, object):
Expand Down Expand Up @@ -89,65 +87,3 @@ def _on_cancel(self):
self._do_recursive = True
self._recursive_cbx.setChecked(self._do_recursive)
self.fade_close()


class DependenciesOutputDialog(artella.Dialog, object):
def __init__(self, parent=None, **kwargs):
super(DependenciesOutputDialog, self).__init__(parent, **kwargs)

def get_main_layout(self):
main_layout = QtWidgets.QVBoxLayout()
main_layout.setContentsMargins(2, 2, 2, 2)
main_layout.setSpacing(2)

return main_layout

def setup_ui(self):
super(DependenciesOutputDialog, self).setup_ui()

self.setWindowTitle('Get Dependencies Result')

deps_lbl = QtWidgets.QLabel('Following dependencies have been retrieved: ')
self._deps_tree = QtWidgets.QTreeWidget()
self._deps_tree.setHeaderLabels(['Dependency Path'])

button_layout = QtWidgets.QHBoxLayout()
self._ok_btn = QtWidgets.QPushButton('Ok')
button_layout.addStretch()
button_layout.addWidget(self._ok_btn)
button_layout.addStretch()

self.main_layout.addWidget(deps_lbl)
self.main_layout.addWidget(self._deps_tree)
self.main_layout.addLayout(button_layout)

self._ok_btn.clicked.connect(self._on_ok)

self.resize(QtCore.QSize(350, 350))

def showEvent(self, event):
self._deps_tree.expandAll()
super(DependenciesOutputDialog, self).showEvent(event)

def add_dependency(self, item_path, parent_path):
if not item_path:
return

new_item = QtWidgets.QTreeWidgetItem()
new_item.setText(0, item_path)
if os.path.isfile(item_path):
new_item.setBackgroundColor(0, QtGui.QColor(80, 120, 110))
else:
new_item.setBackgroundColor(0, QtGui.QColor(195, 55, 55))
if not parent_path:
self._deps_tree.addTopLevelItem(new_item)
else:
parent_item = self._deps_tree.findItems(parent_path, QtCore.Qt.MatchExactly)
if not parent_item:
self._deps_tree.addTopLevelItem(new_item)
else:
parent_item = parent_item[0]
parent_item.addChild(new_item)

def _on_ok(self):
self.fade_close()
78 changes: 78 additions & 0 deletions artella/plugins/getdependencies/widgets/outputdialog.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-

"""
Module that contains Artella Get Dependencies custom widgets
"""

from __future__ import print_function, division, absolute_import

import os

import artella
from artella.core import qtutils

if qtutils.QT_AVAILABLE:
from artella.externals.Qt import QtCore, QtWidgets, QtGui


class DependenciesOutputDialog(artella.Dialog, object):
def __init__(self, parent=None, **kwargs):
super(DependenciesOutputDialog, self).__init__(parent, **kwargs)

def get_main_layout(self):
main_layout = QtWidgets.QVBoxLayout()
main_layout.setContentsMargins(2, 2, 2, 2)
main_layout.setSpacing(2)

return main_layout

def setup_ui(self):
super(DependenciesOutputDialog, self).setup_ui()

self.setWindowTitle('Get Dependencies Result')

deps_lbl = QtWidgets.QLabel('Following dependencies have been retrieved: ')
self._deps_tree = QtWidgets.QTreeWidget()
self._deps_tree.setHeaderLabels(['Dependency Path'])

button_layout = QtWidgets.QHBoxLayout()
self._ok_btn = QtWidgets.QPushButton('Ok')
button_layout.addStretch()
button_layout.addWidget(self._ok_btn)
button_layout.addStretch()

self.main_layout.addWidget(deps_lbl)
self.main_layout.addWidget(self._deps_tree)
self.main_layout.addLayout(button_layout)

self._ok_btn.clicked.connect(self._on_ok)

self.resize(QtCore.QSize(350, 350))

def showEvent(self, event):
self._deps_tree.expandAll()
super(DependenciesOutputDialog, self).showEvent(event)

def add_dependency(self, item_path, parent_path):
if not item_path:
return

new_item = QtWidgets.QTreeWidgetItem()
new_item.setText(0, item_path)
if os.path.isfile(item_path):
new_item.setBackgroundColor(0, QtGui.QColor(80, 120, 110))
else:
new_item.setBackgroundColor(0, QtGui.QColor(195, 55, 55))
if not parent_path:
self._deps_tree.addTopLevelItem(new_item)
else:
parent_item = self._deps_tree.findItems(parent_path, QtCore.Qt.MatchExactly)
if not parent_item:
self._deps_tree.addTopLevelItem(new_item)
else:
parent_item = parent_item[0]
parent_item.addChild(new_item)

def _on_ok(self):
self.fade_close()

0 comments on commit 2c20fa8

Please sign in to comment.