Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make gui/workorder-details and gui/workshop-job work again #799

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
84fc36d
Update workorder-details.lua
TymurGubayev Aug 13, 2023
1f9c249
Update workorder-details.rst
TymurGubayev Aug 13, 2023
9eca80b
remove trailing whitespaces
TymurGubayev Aug 13, 2023
8b559fd
merge workorder-details into workshop-job, update to not use `gui.dia…
TymurGubayev Sep 3, 2023
c94a5be
Update job-details.lua: fix whitespaces
TymurGubayev Sep 3, 2023
1f2c9f5
`require 'gui.dialogs'` for the `showMessage()`
TymurGubayev Sep 3, 2023
3846f1f
add instructions how to open the tool
TymurGubayev Sep 3, 2023
d80af4f
explain magic numbers
TymurGubayev Oct 2, 2023
d06b5a8
make use of more specific focus strings
TymurGubayev Oct 2, 2023
937e6d2
avoid redefining a variable
TymurGubayev Oct 2, 2023
e2bd30f
use more descriptive label text
TymurGubayev Oct 8, 2023
07a9ccd
separate ZScreenModal and Window
TymurGubayev Oct 10, 2023
bfa2892
separate ZScreenModal and Window, part 2
TymurGubayev Oct 10, 2023
590dd4a
add the widget to workorder conditions as well
TymurGubayev Nov 5, 2023
7603249
use HotkeyLabel to make actions clickable
TymurGubayev Nov 5, 2023
9ada99a
place the overlay text over task name in BuildingTask view regardless…
TymurGubayev Nov 5, 2023
ef0ebcc
do not show unnamed flags even if set
TymurGubayev Nov 5, 2023
bf055ab
job-details.rst: mention where can we find the tool
TymurGubayev Nov 5, 2023
85b92c0
enable in the workshops' work order details screen
TymurGubayev Nov 5, 2023
36985ed
improve positioning logic for building overlay
TymurGubayev Nov 6, 2023
069fd09
set auto_width=true on hotkey labels
TymurGubayev Nov 6, 2023
bd88a1a
remove the 'LEAVESCREEN' label
TymurGubayev Nov 7, 2023
77ab5b9
only hide numeric flag names if `dfhack.getHideArmokTools() == true`
TymurGubayev Nov 7, 2023
597c48a
Use user-friendly quantity instead of internal counter
TymurGubayev Nov 7, 2023
cd7ca2f
use window size do determine if tabs are in two rows
TymurGubayev Nov 7, 2023
bb95a28
disable the key if job has no items
TymurGubayev Nov 7, 2023
17ca139
add an ability to reset changes
TymurGubayev Nov 7, 2023
e861565
disable "change type" if Armok mode is off
TymurGubayev Nov 7, 2023
5ac5b9c
use special setItemType and setMaterial methods when resetting changes
TymurGubayev Nov 7, 2023
11393bc
fix a bug introduced in recent commit
TymurGubayev Nov 7, 2023
492417b
fix another bug
TymurGubayev Nov 10, 2023
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
29 changes: 16 additions & 13 deletions docs/gui/workshop-job.rst → docs/gui/job-details.rst
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
gui/workshop-job
================
gui/job-details
===============

.. dfhack-tool::
:summary: Adjust the input materials used for a job at a workshop.
:tags: unavailable fort inspection jobs
:summary: Adjust the input materials and traits used for a job or manager order.
:tags: fort inspection jobs workorders interface

This tool allows you to inspect or change the input reagents for the selected
workshop job (in :kbd:`q` mode).

.. image:: /docs/images/workshop-job.png
This tool allows you to inspect or change the input reagents for the selected job:
open the job's "Details" screen by clicking the magnifying glass, then press :kbd:`Ctrl-D`
or click the "Configure job inputs" label. This is possible in a workshop
job list and manager work order list (in case the magnifying glass is present),
as well as from the work order conditions screen.

Pressing :kbd:`i` shows a dialog where you can select an item type from a list.

.. image:: /docs/images/workshop-job-item.png

TymurGubayev marked this conversation as resolved.
Show resolved Hide resolved
Pressing :kbd:`m` (unless the item type does not allow a material) lets you
choose a material.

.. image:: /docs/images/workshop-job-material.png

Since there are a lot more materials than item types, this dialog is more
complex and uses a hierarchy of sub-menus. List choices that open a sub-menu are
marked with an arrow on the left.
Expand Down Expand Up @@ -48,4 +45,10 @@ Usage

::

gui/workshop-job
gui/job-details

Overlay
-------

The position of the "details" button that appears when a job details
window is open is configurable via `gui/overlay`.
20 changes: 0 additions & 20 deletions docs/gui/workorder-details.rst
TymurGubayev marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

Loading
Loading