Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion activity_browser/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This module orchestrates the main application components including the main wind
- `main_window` - MainWindow instance

- **`main_window.py`** - MainWindow class that holds the central widget and dock panes
- **`menu_bar.py`** - Application menu bar with File, Edit, View, Tools, Help menus
- **`menu_bar.py`** - Application menu bar with Project, Database, Impact categories, Calculate, View, and Help menus
- **`signalling.py`** - ABSignals class that bridges bw2data signals to Qt signals

## Architecture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def run(cls, nodes: List[tuple | int | bd.Node], to_db_name: str = None):
return
else:
to_db_name = cls.request_db(from_db_name)
if not to_db_name:
return

to_db_backend = bd.databases[to_db_name]["backend"]

Expand Down
2 changes: 1 addition & 1 deletion activity_browser/app/actions/calculation_setup/cs_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CSNew(ABAction):
"""

icon = qicons.add
text = "New calculation setup..."
text = "New setup..."

@staticmethod
@exception_dialogs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DatabaseExportBW2Package(ABAction):
"""

# icon = icons.qicons.export_db
text = "Export to .bw2package"
text = "Export to .bw2package..."
tool_tip = "Export database(s) to BW2Package format"

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class DatabaseExportExcel(ABAction):
"""

icon = application.style().standardIcon(QtWidgets.QStyle.SP_DriveHDIcon)
text = "Export to Excel (.xlsx)"
text = "Export to Excel (.xlsx)..."
tool_tip = "Export database(s) to Excel format"

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class DatabaseImportFromEcoinvent(ABAction):
"""

icon = icons.qicons.import_db
text = "Import database from ecoinvent"
text = "Import from ecoinvent..."
tool_tip = "Import database from ecoinvent"

@staticmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class DatabaseImporterBW2Package(ABAction):
"""ABAction to open the DatabaseImportWizard"""

icon = icons.qicons.import_db
text = "Import database from .bw2package"
text = "Import from .bw2package..."
tool_tip = "Import database from .bw2package"

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class DatabaseImporterExcel(ABAction):
"""ABAction to open the DatabaseImportWizard"""

text = "Import database from brightway excel format"
text = "Import from .xlsx..."
tool_tip = "Import database from brightway excel format"

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MethodImporterBW2IO(MethodImporterEcoinvent):
"""ABAction to import ecoinvent methods shipped with BW2IO"""

icon = icons.qicons.import_db
text = "Import methods from BW2IO"
text = "Import from bw2io..."
tool_tip = "Import methods that come shipped with BW2IO"

@classmethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MethodImporterEcoinvent(ABAction):
"""ABAction to import methods from ecoinvent"""

icon = icons.qicons.import_db
text = "Import methods from ecoinvent excel format"
text = "Import from ecoinvent excel..."
tool_tip = "Import methods from ecoinvent excel format"

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion activity_browser/app/actions/project/project_delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class ProjectDelete(ABAction):
"""

icon = qicons.delete
text = "Delete this project"
text = "Delete"
tool_tip = "Delete the project"

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion activity_browser/app/actions/project/project_duplicate.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ProjectDuplicate(ABAction):
"""

icon = qicons.copy
text = "Duplicate this project"
text = "Duplicate..."
tool_tip = "Duplicate the project"

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion activity_browser/app/actions/project/project_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ProjectExport(ABAction):
package the project and save it there. Saving code copied from bw2data.backup.
"""
icon = app.application.style().standardIcon(QtWidgets.QStyle.SP_DriveHDIcon)
text = "&Export this project..."
text = "Export..."
tool_tip = "Export project to file"

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion activity_browser/app/actions/project/project_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ProjectImport(ABAction):
imported project.
"""
icon = qicons.import_db
text = "&Import a project..."
text = "Import from tar.gz file..."
tool_tip = "Import project from a file"

@classmethod
Expand Down
19 changes: 5 additions & 14 deletions activity_browser/app/actions/project/project_manager_open.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
from qtpy import QtCore

from activity_browser import app
from activity_browser.app.actions.base import ABAction, exception_dialogs

from activity_browser.ui.icons import qicons


class ProjectManagerOpen(ABAction):
"""
ABAction to delete a database from the project. Asks the user for confirmation. If confirmed, instructs the
DatabaseController to delete the database in question.
"""
"""Open Settings focused on the Projects chapter."""

icon = qicons.delete
text = "Open project manager"
icon = qicons.settings
text = "Manage projects"

@staticmethod
@exception_dialogs
def run():
from activity_browser.app.panes import ProjectManagerPane
from activity_browser.app.pages.settings import SettingsPage

project_manager = ProjectManagerPane(app.main_window)
app.main_window.addDockWidget(
QtCore.Qt.LeftDockWidgetArea,
project_manager.getDockWidget(app.main_window))
SettingsPage.open_chapter("Projects")
2 changes: 1 addition & 1 deletion activity_browser/app/actions/project/project_new.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ProjectNew(ABAction):
"""

icon = qicons.add
text = "New project"
text = "Empty project..."
tool_tip = "Make a new project"

@staticmethod
Expand Down
Loading
Loading